updated login and some models