a few moar changes