diff --git a/README.md b/README.md
index 479a0952..6fcfeaac 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,11 @@ metrics. Metrics include connected gNodeB's and its status.
 - Xn handover
 - PDU Establishment Request/Release
 - Paging
+- CN High Availibilty and Stateless session support
+- AMF metrics are available via metricfunc on the 5g Grafana dashboard
 
 ## Upcoming Changes in AMF
-- AMF stateless and moving the subscriber states in the database
-- Supporting multiple instances of AMF
+
 
 
 Compliance of the 5G Network functions can be found at [5G Compliance ](https://docs.sd-core.opennetworking.org/master/overview/3gpp-compliance-5g.html)
diff --git a/context/amf_ue.go b/context/amf_ue.go
index f28ea175..1f58fc5d 100644
--- a/context/amf_ue.go
+++ b/context/amf_ue.go
@@ -1046,7 +1046,7 @@ func getPublishUeCtxtInfoOp(state fsm.StateType) mi.SubscriberOp {
 	}
 }
 
-//Collect Ctxt info and publish on Kafka stream
+// Collect Ctxt info and publish on Kafka stream
 func (ueContext *AmfUe) PublishUeCtxtInfo() {
 	op := getPublishUeCtxtInfoOp(ueContext.State[models.AccessType__3_GPP_ACCESS].Current())
 	kafkaSmCtxt := mi.CoreSubscriber{}
diff --git a/metrics/kafka.go b/metrics/kafka.go
index a3edc9ab..9b853640 100644
--- a/metrics/kafka.go
+++ b/metrics/kafka.go
@@ -79,7 +79,7 @@ func (writer Writer) PublishUeCtxtEvent(ctxt mi.CoreSubscriber, op mi.Subscriber
 
 var nfInstanceId string
 
-//initialised by context package
+// initialised by context package
 func SetNfInstanceId(s string) {
 	nfInstanceId = s
 }
diff --git a/producer/n1n2message.go b/producer/n1n2message.go
index 1d4efd90..6b4853a8 100644
--- a/producer/n1n2message.go
+++ b/producer/n1n2message.go
@@ -114,6 +114,7 @@ func HandleN1N2MessageTransferRequest(request *http_wrapper.Request) *http_wrapp
 //     response
 //   - problemDetails: if AMF reject the request due to application error, e.g. UE context not found.
 //   - TransferErr: if AMF reject the request due to procedure error, e.g. UE has an ongoing procedure.
+//
 // see TS 29.518 6.1.3.5.3.1 for more details.
 func N1N2MessageTransferProcedure(ueContextID string, reqUri string,
 	n1n2MessageTransferRequest models.N1N2MessageTransferRequest) (