More readme and tidying of main