few tweaks to get more msgs through