Some fixes to if/else indents.
Fixing swarm arrays and indices.