Minor adjustments, fixed carousel numbering