fix combined axes, fix typos