bug fixes, support for new tax bill