ZINCRBY

and some cleanup