Added ECR to comparator, styling, some checks in comparator