Fixed a bunch of broken stuff
Accidentally left a password in there