Adding demos
Better error parsing