Various fixes, one new unit type