Tidying up, fixing obvious errors in block and markup