bug fixes and code coverage