* improvements/fix typos