Added my nitpicks.