Cleaned up user-init some more, I want to add dirtree at some point.