some misc commits while I was on a plane
updates for my mistakes