Additional review for consistency; corrections throughout