fixed models, added some stuff to update survey