InputParser updated, and major bug fix.