Move material on fibre products rings and add more

This is what happens when you initially aren't general enough.