fixed bug with bet + refactoring messages