rationalize filenames. add logging back