Buff bolts and make math less annoying