Fixed lookup for rigidbody node - this still needs review, but leave it for now
Noted some todo's