A ton of bugfixes :)