New mixins and some refinements.