diff --git a/MotorControl/protocol.cpp b/MotorControl/protocol.cpp
index cf0c3bb6..8aaa9166 100644
--- a/MotorControl/protocol.cpp
+++ b/MotorControl/protocol.cpp
@@ -8,9 +8,9 @@ Endpoint endpoints[] = {
     Endpoint("vbus_voltage", static_cast<const float>(vbus_voltage)),
     Endpoint("elec_rad_per_enc", elec_rad_per_enc),
     Endpoint("motor0", BEGIN_TREE, nullptr, nullptr, nullptr),
-    Endpoint("pos_setpoint", motors[0].pos_setpoint),
-    Endpoint("pos_gain", motors[0].pos_gain),
-    Endpoint("vel_setpoint", motors[0].vel_setpoint),
+        Endpoint("pos_setpoint", motors[0].pos_setpoint),
+        Endpoint("pos_gain", motors[0].pos_gain),
+        Endpoint("vel_setpoint", motors[0].vel_setpoint),
     Endpoint(nullptr, END_TREE, nullptr, nullptr, nullptr) // motor0
 };
 
@@ -78,6 +78,7 @@ void Protocol_parse_cmd(uint8_t* buffer, int len) {
         // s index value
         size_t index = 0;
         size_t pos = 0;
+        // Oskar: format string start should be w, not s
         int numscan = sscanf((const char*)buffer, "s %u %n", &index, &pos);
         if (numscan == 1) {
             if (index < NUM_ENDPOINTS) {
diff --git a/MotorControl/protocol.h b/MotorControl/protocol.h
index fa538908..9310aa13 100644
--- a/MotorControl/protocol.h
+++ b/MotorControl/protocol.h
@@ -31,6 +31,15 @@ const char *_type_names[] = {
 
 // Default getters/setters
 
+// Oskar: Instead of creating all these functions, couldn't you just create one
+// function called "default printer", which takes as an argument the _type_info,
+// and has a big switch statement?
+
+// You could extend this, and store only a single parse function pointer, and 
+// pass in a bool indicating if we are reading or writing, hence save some memory.
+// We lose generality of nulling out the scanf part on const, but you could just
+// create duplicates in TypeInfo_t (const and non-const). Debatable if it's worth it...
+
 PrintCallback print_float = std::bind(printf, "%f", std::placeholders::_1);
 ScanCallback scan_float = std::bind(sscanf, std::placeholders::_1, "%f", std::placeholders::_2);
 
@@ -44,7 +53,10 @@ PrintCallback print_uint16 = std::bind(printf, "%d", std::placeholders::_1);
 ScanCallback scan_uint16 = std::bind(sscanf, std::placeholders::_1, "%d", std::placeholders::_2);
 
 class Endpoint {
+// Oskar: public before private: https://google.github.io/styleguide/cppguide.html#Declaration_Order
 private:
+    // Oskar: variable naming: underscores at end not beginning of Class Data Members,
+    // https://google.github.io/styleguide/cppguide.html#Variable_Names
     const TypeInfo_t _type_info;
     const PrintCallback _print_callback;
     ScanCallback _scan_callback;
@@ -71,6 +83,9 @@ public:
     {
     }
 
+    //Oskar: very nice that you omit scan feature when const.
+    // It would be cool if you can relay this writable info in the JSON,
+    // so that something like the GUI can draw a grayed out box.
     Endpoint(const char* name, const float& ctx) :
         Endpoint(name, AS_FLOAT, print_float, &ctx) {}
     Endpoint(const char* name, float& ctx) :