osx fixes, font alignment beautification:
merge