Major fix for the_crusade_target bug and removal of workarounds

:dancer: