forgot a bit in squad assignment mask, other small changes