Updates to tidy up things, and add patron