Carousel cleaned up and working