A number of minute changes incl. better help (we hope)