added sessions, fixed controllers