plugin updates
fixed merges with OSX