Fix bug in slides
Fixup and cleanup