diff --git a/src/interface/viewport.c b/src/interface/viewport.c
index 4fa7de4f4e..c1ee3cb67c 100644
--- a/src/interface/viewport.c
+++ b/src/interface/viewport.c
@@ -677,7 +677,7 @@ void viewport_render(rct_drawpixelinfo *dpi, rct_viewport *viewport, int left, i
 void viewport_paint(rct_viewport* viewport, rct_drawpixelinfo* dpi, int left, int top, int right, int bottom){
 	gCurrentViewportFlags = viewport->flags;
 	//This should still be updated until the rest of supports, etc, is reverse-engineered. Otherwise
-	// Wooden Coaster supports (and a few other coaster supports) will still appear even if "invisible supports"
+	// supports for unimplemented rollercoasters will still appear even if "invisible supports"
 	// are enabled.
 	RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_VIEWPORT_FLAGS, uint16) = (uint16)viewport->flags;
 	RCT2_GLOBAL(RCT2_ADDRESS_VIEWPORT_ZOOM, uint16) = viewport->zoom;
diff --git a/src/interface/viewport.h b/src/interface/viewport.h
index 11d9997af4..c373431694 100644
--- a/src/interface/viewport.h
+++ b/src/interface/viewport.h
@@ -43,19 +43,19 @@ enum {
 };
 
 enum {
-	VIEWPORT_INTERACTION_ITEM_NONE = 0,
-	VIEWPORT_INTERACTION_ITEM_TERRAIN = 1,
-	VIEWPORT_INTERACTION_ITEM_SPRITE = 2,
-	VIEWPORT_INTERACTION_ITEM_RIDE = 3,
-	VIEWPORT_INTERACTION_ITEM_WATER = 4,
-	VIEWPORT_INTERACTION_ITEM_SCENERY = 5,
-	VIEWPORT_INTERACTION_ITEM_FOOTPATH = 6,
-	VIEWPORT_INTERACTION_ITEM_FOOTPATH_ITEM = 7,
-	VIEWPORT_INTERACTION_ITEM_PARK = 8,
-	VIEWPORT_INTERACTION_ITEM_WALL = 9,
-	VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY = 10,
-	VIEWPORT_INTERACTION_ITEM_LABEL = 11,
-	VIEWPORT_INTERACTION_ITEM_BANNER = 12,
+	VIEWPORT_INTERACTION_ITEM_NONE,
+	VIEWPORT_INTERACTION_ITEM_TERRAIN,
+	VIEWPORT_INTERACTION_ITEM_SPRITE,
+	VIEWPORT_INTERACTION_ITEM_RIDE,
+	VIEWPORT_INTERACTION_ITEM_WATER,
+	VIEWPORT_INTERACTION_ITEM_SCENERY,
+	VIEWPORT_INTERACTION_ITEM_FOOTPATH,
+	VIEWPORT_INTERACTION_ITEM_FOOTPATH_ITEM,
+	VIEWPORT_INTERACTION_ITEM_PARK,
+	VIEWPORT_INTERACTION_ITEM_WALL,
+	VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY,
+	VIEWPORT_INTERACTION_ITEM_LABEL,
+	VIEWPORT_INTERACTION_ITEM_BANNER,
 
 };
 
diff --git a/src/interface/window.h b/src/interface/window.h
index 7b27a4f4b6..7ea08d9ee1 100644
--- a/src/interface/window.h
+++ b/src/interface/window.h
@@ -76,7 +76,6 @@ typedef struct rct_widget {
 
 /**
  * Viewport structure
- * size: 0x14
  */
 typedef struct rct_viewport {
 	sint16 width;					// 0x00