lots more type fixes