Just a bunch of changes

that I forgot to commit