adapted to new naming; clarify comments somewhat
3 files changed