Lot of map/bot/fight improvements