HQM updates

See spreadsheet under 0.9.6 updates.