Fixed collectiveless implementation, fixed arming problems.