Map fixes

(This is going to master!)

Faux and my map changes and fixes. Both of us did these fairly early in the morning for our respective timezones, so there might be some minor error. Also, due to the process this isn't using the good-method.

Changes include; Firelock shenanigans, fixes, some more fixes, and just tons of fixes I'm not going to lie Faux doesn't even remember half the things she did. However, we cleared out all of the reported map issues.