Implementation of replace/add methods, fixes to direct client interaction, misc touch ups.