typos and tweak