Some fixes

Bodies are deleted with an unordered set now