Minor updates, parser allows nested function calls