Login now working and general improvements