Some changes to canvas demo