Moved client protocol into MapState.protocol field, various other minor tidy-ups
Moved client protocol into MapState.protocol field, various other minor tidy-ups

shockkolate/scuffle,shockkolate/scuffle,shockkolate/scuffle