[PATCH v2 00/14] reply refactor, fixes