add commenter and surrount modules
use comma as leader