small cleanups and fixes

no biggies but still ...