v2.20 Bug fixes, optimizations for upcoming new map

Various bug fixes
Some necessary optimizations for the upcoming Bloodhaven map