Fix tax calculation

Also get rid of 'dead code',
and
make dictionary of costs such that items can be left or commented out
rather than keys included in a separate iterable.