additional bug fixes and clean up