fix typos and inconsintences