Fixing building on Master.
Some initial changes.
Code style changes.
Merge remote-tracking branch 'github/master' into PPK-overhaul