Ironed out a nice bunch of the errors.