Cleaning up, added more consistent stats
Short down on some stuff