diff --git a/libs/chessarbiter b/libs/chessarbiter
index 975ad84..90050da 160000
--- a/libs/chessarbiter
+++ b/libs/chessarbiter
@@ -1 +1 @@
-Subproject commit 975ad849d1d1474e601ad2f4bf48ea0e4405251c
+Subproject commit 90050da015f3988ab3188eb19629aed262454fef
diff --git a/libs/pgnp b/libs/pgnp
index 43434b1..bebbc79 160000
--- a/libs/pgnp
+++ b/libs/pgnp
@@ -1 +1 @@
-Subproject commit 43434b170c2725d74f2d91f4cc86b85303893f08
+Subproject commit bebbc7982482a2271096ef53c778cd93a4bbff7a
diff --git a/src/base_tab/BaseTab.cpp b/src/base_tab/BaseTab.cpp
index c0ed8cb..95a1a8d 100644
--- a/src/base_tab/BaseTab.cpp
+++ b/src/base_tab/BaseTab.cpp
@@ -17,7 +17,7 @@ BaseTab::BaseTab(wxFrame *parent)
 }
 
 void BaseTab::OnBim(wxCommandEvent &event) {
-  // LoadFile("/home/loic/hartwig.pgn");
+   LoadFile("/home/loic/hartwig.pgn");
 }
 
 void BaseTab::OnOpenGame(wxListEvent &event) {
diff --git a/src/game_tab/HalfMove.cpp b/src/game_tab/HalfMove.cpp
index 1a6b5aa..94d9a8c 100644
--- a/src/game_tab/HalfMove.cpp
+++ b/src/game_tab/HalfMove.cpp
@@ -135,9 +135,7 @@ HalfMove::HalfMove(pgnp::HalfMove *m, std::string initial_fen): capture(' ') {
     this->SetMainline(new HalfMove(m->MainLine, arbiter.GetFEN()));
   }
   for (pgnp::HalfMove *v : m->variations) {
-    arbiter.Setup(initial_fen);
-    arbiter.Play(arbiter.ParseSAN(v->move));
-    this->AddVariation(new HalfMove(v, arbiter.GetFEN()));
+    this->AddVariation(new HalfMove(v, initial_fen));
   }
 }
 
diff --git a/src/game_tab/editor/EditorCanvas.cpp b/src/game_tab/editor/EditorCanvas.cpp
index 441118d..0e2f77a 100644
--- a/src/game_tab/editor/EditorCanvas.cpp
+++ b/src/game_tab/editor/EditorCanvas.cpp
@@ -69,6 +69,8 @@ void EditorCanvas::DrawElement(const cgeditor::Element &e) {
         p = 'Q';
       } else if (e.prop & cgeditor::Property::King) {
         p = 'K';
+      } else if (e.prop & cgeditor::Property::Rook) {
+        p = 'R';
       }
       if (e.prop & cgeditor::Property::Black) {
         p = std::tolower(p);