add JSON patch/pointer; cleanup