Second revised plan map. I found I wasn't giving myself enough space for all the contour lines while working on the southeast corner, so using the brush tool I drew the yellow and gold lines on another layer to plan out the space they'll need.
