fixed a lot of survey bugs, changed omer a bit, surveys seem to be working