another move towards osx support, other minor changes