Scouting message crafting

Scouting message crafting and minor cleanup.