several correction, completion in present modal view