Tidy up, add new examples