improved obstacle/smoke handling