gustafn
committed
on 29 Nov
more polishing of message keys and code