Fixes
Rewrite everything. Tree store structure has been changed