Address various comments made by Mark and Roger