cleaned up some code, added carousel mixins