minor cleanup.  mostly sharing debug points with Jon