features and demo pages improvements