minor update+some mixins