more demo improvements