fixed some carousel stuff
Merge branch 'master' into ryan