fix newlines and espaced single quotes
merge more changes from the leaves
and more?