Fixed bugs, moved passwords to seperate file