Abandoned Souls: Bug fixes and optimization fixes.

Bug fixes and optimization fixes.