Carousel fixes and improvements