File parser now works correctly, -f option now works too