diff --git a/link2aws.js b/link2aws.js
index 121286a..b4eacdd 100644
--- a/link2aws.js
+++ b/link2aws.js
@@ -164,7 +164,7 @@ class ARN {
                 "analyzer": () => `https://${this.region}.${this.console}/access-analyzer/home?region=${this.region}#/analyzer/${this.resource}`,
             },
             "acm": { // AWS Certificate Manager
-                "certificate": () => `https://${this.console}/acm/home?region=${this.region}#/?id=${this.resource}`,
+                "certificate": () => `https://${this.console}/acm/home?region=${this.region}#/certificates/${this.resource}`,
             },
             "acm-pca": { // AWS Certificate Manager Private Certificate Authority
                 "certificate-authority": null,
@@ -182,7 +182,11 @@ class ARN {
                 },
             },
             "apigateway": { // Manage Amazon API Gateway
-                "": null,
+                "": () => {
+                    const parts = this.resource.split('/');
+                    const myid = parts[2]; 
+		    return `https://${this.region}.${this.console}/apigateway/main/apis/${myid}/resources?api=${myid}&region=${this.region}`;
+                    },
             },
             "appconfig": { // AWS AppConfig
                 "application": null,
@@ -287,7 +291,7 @@ class ARN {
             },
             "codebuild": { // AWS CodeBuild
                 "build": null,
-                "project": null,
+                "project": () => `https://${this.region}.${this.console}/codesuite/codebuild/projects/${this.resource}`,
                 "report": null,
                 "report-group": null,
             },
@@ -435,6 +439,7 @@ class ARN {
                 "dedicated-host": null,
                 "dhcp-options": null,
                 "elastic-gpu": null,
+                "eip-allocation": () => `https://${this.region}.${this.console}/ec2/home?region=${this.region}#Addresses:v=3;search=:${this.resource}`,
                 "fpga-image": null,
                 "image": () => `https://${this.region}.${this.console}/ec2/home?region=${this.region}#ImageDetails:imageId=${this.resource}`,
                 "instance": () => `https://${this.region}.${this.console}/ec2/home?region=${this.region}#InstanceDetails:instanceId=${this.resource}`,
@@ -475,7 +480,7 @@ class ARN {
                 "vpn-gateway": null,
             },
             "ecr": { // Amazon Elastic Container Registry
-                "repository": null,
+                "repository": () => `https://${this.region}.${this.console}/ecr/repositories/private/${this.account}/${this.resource}`,
             },
             "ecs": { // Amazon Elastic Container Service
                 "cluster": () => `https://${this.region}.${this.console}/ecs/v2/clusters/${this.resource}?region=${this.region}`,
@@ -502,7 +507,7 @@ class ARN {
                 "application": null,
                 "applicationversion": null,
                 "configurationtemplate": null,
-                "environment": null,
+                "environment": () => `https://${this.region}.${this.console}/elasticbeanstalk/home?region=${this.region}#/environments`,
                 "platform": null,
                 "solutionstack": null,
             },
@@ -526,7 +531,7 @@ class ARN {
                 "preset": null,
             },
             "es": { // Amazon Elasticsearch Service
-                "domain": null,
+                "domain": () => `https://${this.region}.${this.console}/aos/home?region=${this.region}#opensearch/domains/${this.resource}`,
             },
             "events": { // Amazon EventBridge
                 "event-bus": null,
@@ -579,7 +584,7 @@ class ARN {
                 "crawler": null,
                 "database": null,
                 "devendpoint": null,
-                "job": null,
+                "job": () => `https://${this.region}.${this.console}/gluestudio/home?region=${this.region}#/editor/job/${this.resource}/script`,
                 "mlTransform": null,
                 "table": null,
                 "tableVersion": null,
@@ -870,7 +875,7 @@ class ARN {
                 "cluster": () => `https://${this.console}/rds/home?region=${this.region}#database:id=${this.resource};is-cluster=true`,
                 "cluster-endpoint": null,
                 "cluster-pg": null,
-                "cluster-snapshot": null,
+                "cluster-snapshot": () => `https://${this.console}/rds/home?region=${this.region}#db-snapshot:id=${this.resource}`,
                 "db": () => `https://${this.console}/rds/home?region=${this.region}#database:id=${this.resource}`,
                 "db-proxy": null,
                 "es": null,
@@ -1129,17 +1134,3 @@ class ARN {
         }
     }
 }
-
-// Running as command line script? (not in browser, and not as library)
-/* istanbul ignore if */
-if (typeof (require) !== 'undefined' && require.main === module) {
-    for (let i = 2; i < process.argv.length; i++) {
-        try {
-            console.log(new ARN(process.argv[i]).consoleLink);
-        } catch (e) {
-            console.error(e);
-        }
-    }
-}
-
-exports.ARN = ARN;
\ No newline at end of file