better file names
some fixes