put in some diagnostics
Better update messages.