Cleanup and comments, mostly for the single user mode stuff