Record original base file name for inputs. Minor fixes.