Sounds good.  I also just marked off all the Imprisoned moves as that, and reorganized them, so the ability section is a bit more clear on which is which.

EDIT: Actually, y'know, let's cut out the genie entirely.  Way too strong.  Also, just cut the abilities down to twelve.