fix #3, minor other message enhancements