Fixed cluster and draw and modified POW to allow easier debug of new
optimizers