Bunch of fixes and features

Feeling way better now :smile: