More macro adjusts

Need to nail down the exact point where osx diverges from windows here
:/ why the shit is this so hard?