Small changes in weld code. Testing still needed.