Dev

Meh, read the commit messages, too lazy haha :)