Fix things

We did stuff and fixed stuff and made things work and stuff.