fixes from manual testing