Tweak reply handling
Stub out more docs