most things fixed from preceding comments. still need to fix map. pushing for review in interim to get working copy.

Change-Id: Ie633af1a2791bdb1cee730e1ed46ee366118f56d