Platform checks standardised a bit. Output logging tidied. Various other bits and pieces.