Fixes #52, #53, trims L1 RHW-4 back to basics.