New stat, major bug fixes