re-create changelist by default
fix CME and simplify code