fixes and new types