Fix mixins
fix gemspec
clean up files