add messages support and fixes