come bug fixes and cleanup