Resolve the combats and clean up the login mechanism a little