clean up and add 10.8 fixes and todo notes