Distibutors Map completed and minor fixes