Adds laurens' fixes, as well as some other stuff. Minions might work now