filenames now used in recursive loading
minor bugfixes