improved collision handling and joints