S3Summary Map fixed & overall improvements