massive update; osx settings handled (mostly)