MC18 carbs are a good upgrade too. They are 32mm compaired to the 28mm on the MC16.
Once you've done that you're pretty much up there power wise if its got a good bottom end in it.
_________________
If I have to take the carbs off once more...