general tidy up, include sample script