Dynamic filearea, filename taken from original file and some more corrections