move out hooks and misc changes
add more misc macosx tweaks