Hello,
We are still in the process of rolling out all of the main character skill updates. I believe there are still some updates yet to be done. However, if you feel that the water main is now an extremely powerful character, the good news is that you are free to play her! With the recent unlimited main changes, you can now use her as much as you'd like!

As for ETR Madara, we are aware that he is unfortunately bugged. We've received word from the devs that he will hopefully be fixed in a week or so.
Sorry for the inconvenience, and thanks for bearing with us!