Fixed line-break bug in dictionary

Fixed line-break bug from windows; also assorted errors when running in
"clean" mode