moar minor changes