massive changes- fixed identity login- still some errors