fixed and cleaned some more stat stuff