Add comments. More comments. Ref: Issue #24