Configured map properly and made numerous other changes