MOre content + tidy up