Slide reorganization, and improvements