hmm mapping can use some touchups...if you need some mapping advice, make a compleate map like how you want it to look, and post it here with my username under it...and I will re-make it and post an image on how it should look, and still have the same stuff.
well thats if you want my help
good luck