user system and bug fixes