added multiuser code to config and cleanup