change error message
fix some errors + refactoring match and bet