cleaned up duplicates
worked on login & db