fix typo and small bug