Merge tidied code and readme changes

Julien has tidied the more_points code, in particular calling subroutines from main, and made some corrections in README.md.