fixing modal problems and refining gts