I'll do the fixes for Shinobu tomorrow. I completely forgot Black Swan was a 2.0 character so I spend a few hours wondering why it wouldn't work.
Anyway I'll start on Arlechinno right now.
Edit: finished about as much as I could