got a working message log, made small fixes elsewhere
Merge branch 'ft-debug' into develop