Fixed issues in response to Bob's comments