Tip: When determining a time limit, remember that players won't be as familiar with the level as you are. If you normally complete the level with the timer around 100, others might run out of time on their first try.
Indeed, makes water levels a lot more enjoyable. The only thing I didn't like was the fact that the button is not configurable - I would have liked to maybe use Y instead of X. But IMO that's not a rejection reason, although if you submit an update that fixes that I'll accept it. Also made SA-1 compatible (i didn't test it with SA-1 though).