a shit ton of stuff

I forgot to commit earlier...