Fixed some bugs

The Swarm Generator was not exactly correct.  Made some changes.  Still
needs some work.