tlpgp2 bugs corrections
merge conflict