Lots of fixes :D

Please refer to changelog.md