work on osx bootstrap
add some more tweaks