9-3-10: Still working on a few additional fixes.