Map Updated, more formatting completed