address misc little issues