Minor fixes and clarification/simplification