committing location ordering fixes and report tweaks by Hugh