text and type fixes