small demo improvements