Improved collision handling and joints