And further corrections re sudo (as per last commit)