Saving surveys done + minor fixes