Fix whitespace, adjust options to try to get stats working