Fix up

Fix typos and other issues