minor changes in response to dave