several fixes and new mixins