HW1 fixes and reorg