bug fixes, minor import improvements.