Added new mixins. Closes #112
Updated comments in mixins file