refactoring some issues
mixin fixes
prepping for v.0.3