Added better default filename functionality
Better filename handling