081914-1027

minor tweaks and clean up