Moar changes based on Boltmade feedback.