Yep. Two terms for senators, four for congressmen sounds about right. Congress briefly considered imposing term limits on themselves some years back, but then decided that it probably wasn't in their best interest.
Beyond that, we need blind elections (no party or incumbent designation on the ballot). This would make it much easier for minority parties to get into power and break up the dual monoparty system we have now.
We have three major minority parties in the U.S. right now (Green, Libertarian, Constitutional), and while their platforms vary greatly, they all have one thing in common - they all want a smaller federal government.