Fix problem with UTubs normal when not on surface, minor cleanups