More stuff (oh god i'm bored to write commit messages)