Add parseInt(x, 10), re-use regexps and handle floats in flat_files