added some new mixins, fixed others