fix typos and inconsistencies