Optimized imports, moved survey stuff around