All cool. Hope it wasn't too hard to get fixed.
Anyway, I had a thought about the RP. Did you want them put in diapers straight away or hold off a bit? I was thinking maybe Makoto treats them as 4/5 year olds initially, but then at some point they do something really childish, like have an accident or throw a tantrum, and that's when Makoto decides to fully baby them.
Only problem is it might be a bit slow. Let me know what you think.