Bugfixes, passwords, cleanup