Fix typos and spiff up display