fixed several demos