some demo improvements