Add both file base name and file path to parser result. Minor fixes.