Added comments. Minor changes. More OS X prep.