Initial change for map fixes
Image load errors.  Fixes #67, #68, #64