rework tree
pins + fixes + files