Updated ToDo
Fixed some bugs with login