tooltip and typecheck improvements