Update syntax & small bug fix.