Cleanup and Bug fixes
Still need pvt msgs and draw pad. if time permits a login screen as
well.