squashed some bugs and made a new user