various fixes

avoid sudo -i where possible because it starts another login shell,
which doesn't know if its a part of a conditional and will do
independent error printing which is confusing.