diff --git a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java
index 55224c729858993c8e954e10569ba1f3c6c03e7c..55a4d0c6f0f2a7a78781d9736f478283b70a115a 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterImpl.java
@@ -25,6 +25,9 @@ import static org.briarproject.bramble.api.transport.TransportConstants.STREAM_H
 import static org.briarproject.bramble.util.ByteUtils.INT_16_BYTES;
 import static org.briarproject.bramble.util.ByteUtils.INT_64_BYTES;
 
+/**
+ * See the BTP-Specs to understand whats going on here
+ */
 @NotThreadSafe
 @NotNullByDefault
 class StreamEncrypterImpl implements StreamEncrypter {
@@ -81,9 +84,9 @@ class StreamEncrypterImpl implements StreamEncrypter {
 		FrameEncoder.encodeNonce(frameNonce, frameNumber, true);
 		try {
 			cipher.init(true, frameKey, frameNonce);
-			int encrypted = cipher.process(frameHeader, 0,
+			int encryptedLength = cipher.process(frameHeader, 0,
 					FRAME_HEADER_PLAINTEXT_LENGTH, frameCiphertext, 0);
-			if (encrypted != FRAME_HEADER_LENGTH) throw new RuntimeException();
+			if (encryptedLength != FRAME_HEADER_LENGTH) throw new RuntimeException();
 		} catch (GeneralSecurityException badCipher) {
 			throw new RuntimeException(badCipher);
 		}
@@ -129,10 +132,10 @@ class StreamEncrypterImpl implements StreamEncrypter {
 		// Encrypt and authenticate the stream header key
 		try {
 			cipher.init(true, streamHeaderKey, streamHeaderNonce);
-			int encrypted = cipher.process(streamHeaderPlaintext, 0,
+			int encryptedLength = cipher.process(streamHeaderPlaintext, 0,
 					STREAM_HEADER_PLAINTEXT_LENGTH, streamHeaderCiphertext,
 					STREAM_HEADER_NONCE_LENGTH);
-			if (encrypted != STREAM_HEADER_PLAINTEXT_LENGTH + MAC_LENGTH)
+			if (encryptedLength != STREAM_HEADER_PLAINTEXT_LENGTH + MAC_LENGTH)
 				throw new RuntimeException();
 		} catch (GeneralSecurityException badCipher) {
 			throw new RuntimeException(badCipher);
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java
index 2079198b3d9ea6e3ccbf3ff14e2bb725863eede8..7b228e9f4ef9e970f3cdd83c4fd637f69e576a72 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java
@@ -26,6 +26,10 @@ import static org.briarproject.bramble.api.sync.RecordTypes.REQUEST;
 import static org.briarproject.bramble.api.sync.RecordTypes.VERSIONS;
 import static org.briarproject.bramble.api.sync.SyncConstants.PROTOCOL_VERSION;
 
+/**
+ * see the BSP-Specs
+ */
+
 @NotThreadSafe
 @NotNullByDefault
 class SyncRecordWriterImpl implements SyncRecordWriter {
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java
index 0b4e3be8f0798d1d086c81c2fe14509ec98f29a1..66bf8a56830897750148c5f842a5b2229113508e 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterImpl.java
@@ -22,7 +22,7 @@ class StreamWriterImpl extends OutputStream implements StreamWriter {
 
 	private final StreamEncrypter encrypter;
 	private final byte[] payload;
-
+	///@var length Stores how long the content that is currently in the buffer "payload" is.
 	private int length = 0;
 
 	StreamWriterImpl(StreamEncrypter encrypter) {
@@ -68,7 +68,8 @@ class StreamWriterImpl extends OutputStream implements StreamWriter {
 
 	@Override
 	public void write(byte[] b, int off, int len) throws IOException {
-		int available = payload.length - length;
+		//Frame Segmentation
+		int available = payload.length - length; // available = How much free space ther is at the end of the buffer "payload"
 		while (available <= len) {
 			System.arraycopy(b, off, payload, length, available);
 			length += available;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java
index 788d51d3cac440fb4c9bd537008ac3661bee057a..e5d304e0afb57290707d9a8cd29d452c3c448c42 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java
@@ -63,6 +63,9 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 
 	@GuardedBy("lock")
 	private final Map<KeySetId, MutableTransportKeySet> keys = new HashMap<>();
+	/**
+	 * List of all Tags
+	 */
 	@GuardedBy("lock")
 	private final Map<Bytes, TagContext> inContexts = new HashMap<>();
 	@GuardedBy("lock")