Fixed lots of small bugs. Still exhibiting mono-cluster effect.