all the latest changes
adding updates for maps and stuff