updating to my branch for 10.9 fixes