add topic to eo and other small changes