syntax checking improvements