Added unequip methods
Added a bunch of map-related code