Avoid obsessive use of uint8_t.
Fix indentation.
Fixed various
Merge remote-tracking branch 'benlaurie/master'

Conflicts:
	trg-s3.cc