small fixes
[enbarr] a bit of new config, [merrow] message handling small fixes