changes to unit + weapon system