correction of all the seen bugs on gc