Add Command -> Message and several bugfixes.