More tidying, updated README