fixed most of the things from the plenary