miscalenaous fixes