Changed the Login and other things