Update in response to feedback; fixes