fixed login; need to play with views but otherwise working