A little cleanup and more carousel fixing