diff --git a/proto/workspace.proto b/proto/workspace.proto
index 6fedcae..26eaa04 100644
--- a/proto/workspace.proto
+++ b/proto/workspace.proto
@@ -15,7 +15,7 @@ service Workspace {
 
 	rpc ListBuffers (common.Empty) returns (files.BufferTree); 
 	rpc ListUsers (common.Empty) returns (common.IdentityList);
-	rpc ListBufferUsers (files.BufferNode) returns (common.IdentityList); //TODO discuss
+	rpc ListBufferUsers (files.BufferNode) returns (common.IdentityList);
 }
 
 message WorkspaceEvent {
@@ -45,6 +45,9 @@ message WorkspaceEvent {
 	}
 }
 
+// TODO this is very ugly because we can't just return a new token (which is already smelly but whatev), we also need to tell the underlying id so that
+//      the client can put it as metadata while attaching, because it can't really know the underlying id that the server is using for each buffer without
+//      parsing the token itself. meehhhhhh, this bleeds underlying implementation to the upper levels, how can we avoid this??
 message BufferCredentials {
 	required common.Identity id = 1;
 	required auth.Token token = 2;