bug fixes - carshes