corrections + colorations
merge