bug fixes, including experiment in sanitizing the filename