fixed up login, still stuff to do though