drop some strlen() calls and fix typos