Fix a typo in ChangeLog
Make the main procedure more testable
Minor fix
Minor fix