Fix parsing of numbers and strings, add lists