a few old uncommitted changes (my bad)
added message management