Some improvements

I improved some mixins, added a few and deleted some