Merged most of Etienne's improvements from last year, including