Megacommit with various changes, including (crappy) HDR. (lost track due to time gap).