Added file search generality and editted parsing mechanic.