diff --git a/.gitignore b/.gitignore
index 00a266a..643c7c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,5 +107,3 @@ log/**
 cache/**
 
 dev
-
-settings.json
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16b0211..39db16c 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - [2020-06-23] Added Gitlab CI integration by [@lflare].
+- [2020-06-28] Added `client_external_port setting` [@wedge1001].
 
 ### Changed
 
@@ -15,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 ### Fixed
+- [2020-06-28] Fixed various state transition bugs by [@carbotaniuman].
 
 ### Security
 
diff --git a/src/main/kotlin/mdnet/base/ServerHandler.kt b/src/main/kotlin/mdnet/base/ServerHandler.kt
index a7f748e..3d81def 100644
--- a/src/main/kotlin/mdnet/base/ServerHandler.kt
+++ b/src/main/kotlin/mdnet/base/ServerHandler.kt
@@ -113,6 +113,6 @@ class ServerHandler(private val settings: ClientSettings) {
         private val STRING_ANY_MAP_LENS = Body.auto<Map<String, Any>>().toLens()
         private val SERVER_SETTINGS_LENS = Body.auto<ServerSettings>().toLens()
         private const val SERVER_ADDRESS = "https://api.mangadex.network/"
-        //private const val SERVER_ADDRESS = "https://mangadex-test.net/"
+//        private const val SERVER_ADDRESS = "https://mangadex-test.net/"
     }
 }
diff --git a/src/main/kotlin/mdnet/base/netty/ApplicationNetty.kt b/src/main/kotlin/mdnet/base/netty/ApplicationNetty.kt
index fbc0392..02bdd82 100644
--- a/src/main/kotlin/mdnet/base/netty/ApplicationNetty.kt
+++ b/src/main/kotlin/mdnet/base/netty/ApplicationNetty.kt
@@ -51,7 +51,6 @@ import java.io.InputStream
 import java.net.InetSocketAddress
 import java.net.SocketException
 import java.security.PrivateKey
-import java.security.cert.Certificate
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import java.util.concurrent.TimeUnit