Revert "Revert "fixing tractor beam push/pull bugs""

This reverts commit 7f096a2f2ebcda1e08153eb70b557c563930414d.