Fix typo and update map bug