incorporate gini index
Revert "incorporate gini index"

This reverts commit 5316000a575ba120552ff5da15c1fa961c512107.
added gini index plus other smaller fixes