bug fixes based on team feedback