A few backtrack changes to check 8. It's done now.