some improvements, Demo app