Two simple things and one not so simple would solve all the budget issues
1) Remove the cap on Social Security Tax. Same percent on all income.
2) with few exceptions, like a home, tax capital gains as income.
3) End loopholes where wealthy show no income because they borrow against assets.