Embarcadero 2 gameplay largely done, except for final testing.
Fix some logic bugs with the Shavarus fight.