bug fixes and integration issues