diff --git a/editor/editor.rc b/editor/editor.rc
index f263c3e..5e20387 100644
--- a/editor/editor.rc
+++ b/editor/editor.rc
@@ -72,6 +72,7 @@ IDR_MENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
+        MENUITEM "New\tCtrl+N",                 ID_FILE_NEW40015
         MENUITEM "&Open\tCtrl+O",               ID_FILE_OPEN
         MENUITEM "&Save\tCtrl+S",               ID_FILE_SAVE
         MENUITEM "Save &As",                    ID_FILE_SAVE_AS
diff --git a/editor/resource.h b/editor/resource.h
index 8acf54d..e8d30e1 100644
--- a/editor/resource.h
+++ b/editor/resource.h
@@ -18,13 +18,14 @@
 #define ID_EDIT_SELECTALL               40012
 #define ID_EDIT_SELECTROW               40013
 #define ID_EDIT_SELECTTRACK             40014
+#define ID_FILE_NEW40015                40015
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104
-#define _APS_NEXT_COMMAND_VALUE         40015
+#define _APS_NEXT_COMMAND_VALUE         40016
 #define _APS_NEXT_CONTROL_VALUE         1004
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
diff --git a/sync/device_client.cpp b/sync/device_client.cpp
index 21e9104..6e9be64 100644
--- a/sync/device_client.cpp
+++ b/sync/device_client.cpp
@@ -82,17 +82,24 @@ bool ClientDevice::update(float row)
 					{
 						int track, row;
 						float value;
-						Track::KeyFrame::InterpolationType interp;
+						char interp;
 						
 						recv(serverSocket, (char*)&track, sizeof(int), 0);
 						recv(serverSocket, (char*)&row,   sizeof(int), 0);
 						recv(serverSocket, (char*)&value, sizeof(float), 0);
 						recv(serverSocket, (char*)&interp, 1, 0);
+
 						
+						assert(interp >= 0);
 						assert(interp < Track::KeyFrame::IT_COUNT);
 						
 						sync::Track &t = syncData.getTrack(track);
-						t.setKeyFrame(row, Track::KeyFrame(value, interp));
+						t.setKeyFrame(row,
+							Track::KeyFrame(
+								value,
+								Track::KeyFrame::InterpolationType(interp)
+							)
+						);
 					}
 					break;
 				
diff --git a/sync/network.h b/sync/network.h
index 3836813..69d2ff4 100644
--- a/sync/network.h
+++ b/sync/network.h
@@ -13,21 +13,21 @@ SOCKET serverConnect(struct sockaddr_in *addr);
 
 bool pollRead(SOCKET socket);
 
-enum RemoteCommand
-{
+enum RemoteCommand {
 	// server -> client
-	SET_KEY,
-	DELETE_KEY,
+	SET_KEY = 0,
+	DELETE_KEY = 1,
 	
 	// client -> server
-	GET_TRACK,
+	GET_TRACK = 2,
 	
 	// client -> server, server -> client
-	SET_ROW,
+	SET_ROW = 3,
 	
 	// server -> client
-	PAUSE,
-	SAVE_TRACKS
+	PAUSE = 4,
+
+	SAVE_TRACKS = 5
 };
 
 #endif /* NETWORK_H */