Corrected mistakes in caretaker