Some tidying up, updating the README