Adding demos and fixes