minor changes to user class and organization