fixes for generic use, improved message delivery