Updating to latest swarm, minor UX config changes.