Add O and R blocks to NL, plus some tidying up