Added map, and attempted to fix the bugs in Inventory