even moar minor fixes