Merge pull request #715 from ESwordTheCat/3gbe@vf1

Small map changes.
Part 1.