Task #32: continuing to test and fix.