I've created this branch with the first batch of my reworked map-texture-image patches. I'm having some network/mail problems so git-send-email isn't working for me ATM. Please review/test and I'll merge to master. Thanks. -Brian