more updates, mixins, extends, moar