Fixed guy bugs and added logged in user