Additional bug fixes, especially some convoluted plot inconsistencies in the Holly Trinity path.