cleaing up
Fix data hooks
Merge from henrik
use mixin
Fix package.json
Fix types