fixed moar things