added some more mixins and also added Lisette as author