Example fixes + tidying up