Revert "updates"

This reverts commit f8d543e4c00f03a8b7bcc5b34d4e4c5021c9aaee.
Revert "change"

This reverts commit 8c1135de99390949a54ccc43de2bcf271d67a434.
updates
Merge https://github.com/sbkohel/fvtaxprep
final commit from web dev version