I286

I though I issued this request a while ago!  This fixes several bugs that people noticed while testing survey editing.