Various tweaks
Added a check that prevents the files from being parsed more than once