RFD 67: some minor updates
RFD 67: some minor updates

davepacheco/rfd,joyent/rfd,joyent/rfd,davepacheco/rfd,AnthonyMann/rfd,rmustacc/rfd,joyent/rfd,rmustacc/rfd,davepacheco/rfd,davepacheco/rfd,joyent/rfd,melloc/rfd,melloc/rfd,davepacheco/rfd,melloc/rfd,AnthonyMann/rfd