fixed barbeer issues