reflect changes made in master for new carousel, other tweaks