Fixed bugs after testing calee