Added drop-last / fixed throttle