A little more work; down to 156 errors