tidy up and added some meta