patches

I thought I had push access to help with some cleanup &  bug fixes - but meh