various fixes
improved message