Add demos, more stl reordering