Fixed most of them, other than the clustering stuff, it probably will be cheating. To add a new feature.
