remove generated files
bugfix with filenames
some more bugfixes