added fix_file_name and properties parser