more var name cleanups, modify error notes
added enable reboot if needed option (not tested), removed debug lines