Misc little things from dave's review