created mixins
bugfixes