fix additonal message bugs