tidying up and tinkering in support of hkfx