Added rest of stats and fixed memory leaks associated with those additions