update mixins and stuff