cleaned up helper methods, fixed login bugs