Final S2 map adjustments

Based on this map: http://i.imgur.com/LuWcssR.png