map fixes and thumbs