fixed my mistakes