Tweaks + Flahne

-Did some setup for proper combat resolution.
-Got Celise busts up and going.