estethical updates to finished unfolder
Merge with lefjoin local