some tidying of demos, more to do