Extra Credit and minor revisionsns.