fixed some of the TODO items on the presentation