Ranked voting for single offices (president, governor, etc), and proportional for any representative body, like the House and Senate. Or, if the Senate is real

Ranked voting for single offices (president, governor, etc), and proportional for any representative body, like the House and Senate. Or, if the Senate is really meant to represent the states rather than the people, it should only be concerned with state issues: which issues belong at the federal level, and which at the state level, for example.