Minor refactoring + guest account bugfixes.