CSC582 corrections.
Merge