some cleanup after merge
corrected rendering problems, changed map colors to make it more clear whats been replaced
Merge pull request #4 from Dinodog/master

Getting the map back on track