more future parser improvements