fixup Expand
fixup more has skill checks
fixup yuuka
testing