fix typos & bugfix #157