Correct mistakes, add part C