fixes and new support