changes to parse now that FileInfo is pretty much in place