Some more things. I'm tired, can't write commit messages