surf data improvements