Code audit, cjaday
Merge branch 'dev-codonbleu' of https://github.com/zoccihedron/wpi-suite into dev-codonbleu