more misc fixes

a bit more cleanup related to #33