Adds more demos and fixes small bugs