comments and organization
fix in repeat and next