A lot of work and bug fixes

it's 2am and I'm my own boss so I can by lazy about my commit messages
if I want to