fixing several issues with EOO calculations and map drawing of invalid occurrences