2.04.0:zeress:130 Partial Pt. 2 for Issue #115

The only thing left to do is the Isles
2.04.0:zeress:131 Fix for Issue #125