bug fixes and unit testing