Add map file textures and remove debug lines properly.
Merge remote-tracking branch 'origin/master'