NSColor and bug fixes