fixes

some clean up