fixed carsh bugs