updates to address a number of the concerns brought up by people.