A few more bugfixes, first stage of liberation now works bug free :)