tidy up and some additions