Great fixes

Accept my pull request to win a car.