lengthened some field names, adding edit condition dialog and server method