Swarm progress and other fixes