First steps of fixing the target trans highlighting bug
Fixed conflicts