finishing v1 of supply and demand

also a lot of polishing, and hid the explanations for now