Add a bunch of changes from the past months

Add everything I've changed since last time, which is a lot, because I'm
lazy and don't commit.