bug fixes and new types