fixed my mistakes...