Merge the standalone branch back into master.

Also fix some small bugs, including with coverage maps.