fixed some tikets