Fixed a few things. Details in changelog