grep /usr/bin/X for auth file, restore extra paranoid cleanup and a few other typos