map::shift order fixes and map.h comment fixes.

Thanks, BevapDin!