replace feinstein paul with smith amash, minor changes