Updated map and fixed animations