Callback working for login. Few minor broken bits fixed.