a might fix from Alan McGee plus some less exciting styling
Merge branch 'round' into testing