HUGE cleanup, add ability to skip password screen (need to write a PreferenceBundle for this)