Edit survey

Made fixes to edit survey. We can talk about it thursday, but I thought I better push now before I forget what I did.