minor conceptual changes