Bug fix, and final stat balance