surface velocity fixes and enhancements