Clean up confs and filenames. #201, #200, #196