Deductions & credits

Gosh - this is *still* not fixed!