moar minor improvements