Fixed parsing of 2+ files...