Issue 115 Added slideshow cleanup changes by justin, fixes to follow