X99 Update
Bits and bobs