Tweaks and such

Fix for #2549
Fix for #2547
I snuck in a fix for #2528 somewhere, but I can't find where.

There's some map fixes/updates coming soon