Removed password reading and fixed bugs