fixed a lot of bugs from last user testing