Slides plus small cleanup