More work on README and tidy up of constants