LOTS OF SMALL CHANGES, ironing out the program now...
Merge remote-tracking branch 'origin/master'