I am in the middle of re-writing this FanFic. I will:

Remove Hiro, he has a new home. As does Marvaie

and get rid of annoying mistakes, I am in the process of getting a Beta-Reader