Updated slides; mainly cleanup
Updated slide generation