mystikx edits

This is a combined commit of all the changes overseen by CivFanatics
user, mystikx21.
Version 3.17 uses these changes.