documentering
fixing mixins