updated entities
eager and simple lazy demos
minor reorg, comments