update for GM
minor: more logging, formatting