updates to mixins and other small updates