Fixed a map error and fixed some items