minor fixes. replace nolist syntax setting by listwrap. Little simple refactoring