more operation design improvements, flushed code