cosmetic changes, not worth a re-compile
add incremental message processing