fixing bugs from manual testing