updates for new protocol stuff

Signed-off-by: Chris Adams <cadams@pivotallabs.com>