Overall changes, modified Connection/login code