more demo cleanup and improvements