Cleanup and corrections here and there.