Some changes

Arranger: included extensions and underscores
Prep: stmtLst