WiP for OS X
added some docs, cleanup and sync