Databases, users, refactoring & bugfixes