Added some support for BasicAlgorithm to do first turns + minor cleanups.
Cleanups