Performance and stability improvements passed over from Warlocks Quarry.

Any issues, please post in the forums.
Thanks.