diff --git a/content/compatibility/_index.md b/content/compatibility/_index.md
index 72d67fe..75e8741 100644
--- a/content/compatibility/_index.md
+++ b/content/compatibility/_index.md
@@ -1,6 +1,6 @@
 ---
 title: "Compatibility chart"
-weight: 3
+weight: 4
 ---
 
 The following table lists the compatibility between each controller (first row) and each software (first column). Additional software compatible with the controllers is also listed. The column for the Multi Train Controller (MTC) specifies the supported cassettes. Scroll to the right to see the full table.
diff --git a/content/controllers/usb/cotm02001/_index.md b/content/controllers/usb/cotm02001/_index.md
new file mode 100644
index 0000000..0f24e7b
--- /dev/null
+++ b/content/controllers/usb/cotm02001/_index.md
@@ -0,0 +1,7 @@
+---
+title: "Train Mascon (Sony PlayStation 2)"
+---
+
+{{% controller-page "cotm02001" %}}
+
+No details are available regarding internal functioning.
diff --git a/content/software/_index.md b/content/software/_index.md
index 13fb0c9..85b46fb 100644
--- a/content/software/_index.md
+++ b/content/software/_index.md
@@ -1,4 +1,4 @@
 ---
-title: "Software"
+title: "Main software"
 weight: 2
 ---
diff --git a/content/software_other/_index.md b/content/software_other/_index.md
new file mode 100644
index 0000000..3f56160
--- /dev/null
+++ b/content/software_other/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Other software"
+weight: 3
+---
diff --git a/content/software_other/pc/_index.md b/content/software_other/pc/_index.md
new file mode 100644
index 0000000..b5798cb
--- /dev/null
+++ b/content/software_other/pc/_index.md
@@ -0,0 +1,4 @@
+---
+title: "PC"
+alwaysopen: false
+---
diff --git a/content/software/pc/bve/_index.md b/content/software_other/pc/bve/_index.md
similarity index 84%
rename from content/software/pc/bve/_index.md
rename to content/software_other/pc/bve/_index.md
index 1b1a6ee..310817f 100644
--- a/content/software/pc/bve/_index.md
+++ b/content/software_other/pc/bve/_index.md
@@ -1,6 +1,6 @@
 ---
 title: "BVE Trainsim"
-weight: 98
+weight: 1
 ---
 
 {{% software-page "pc_bve" %}}
diff --git a/content/software/pc/openbve/_index.md b/content/software_other/pc/openbve/_index.md
similarity index 84%
rename from content/software/pc/openbve/_index.md
rename to content/software_other/pc/openbve/_index.md
index b13ef7f..bf37c25 100644
--- a/content/software/pc/openbve/_index.md
+++ b/content/software_other/pc/openbve/_index.md
@@ -1,6 +1,6 @@
 ---
 title: "OpenBVE"
-weight: 99
+weight: 2
 ---
 
 {{% software-page "pc_openbve" %}}
diff --git a/content/software_other/pc/traincrew/_index.md b/content/software_other/pc/traincrew/_index.md
new file mode 100644
index 0000000..a16987c
--- /dev/null
+++ b/content/software_other/pc/traincrew/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Crew"
+weight: 3
+---
+
+{{% software-page "pc_traincrew" %}}
diff --git a/content/software_other/ps2/_index.md b/content/software_other/ps2/_index.md
new file mode 100644
index 0000000..9e88e2d
--- /dev/null
+++ b/content/software_other/ps2/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Sony PlayStation 2"
+alwaysopen: false
+---
diff --git a/content/software_other/ps2/traindensha/_index.md b/content/software_other/ps2/traindensha/_index.md
new file mode 100644
index 0000000..0054831
--- /dev/null
+++ b/content/software_other/ps2/traindensha/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Simulator ＋ Densha de GO! Tokyu Line"
+weight: 4
+---
+
+{{% software-page "ps2_traindensha" %}}
diff --git a/content/software_other/ps2/trainkeihin/_index.md b/content/software_other/ps2/trainkeihin/_index.md
new file mode 100644
index 0000000..ccd2ea8
--- /dev/null
+++ b/content/software_other/ps2/trainkeihin/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Simulator Real: THE Keihin Electric Express Railway"
+weight: 2
+---
+
+{{% software-page "ps2_trainkeihin" %}}
diff --git a/content/software_other/ps2/trainkeitokei/_index.md b/content/software_other/ps2/trainkeitokei/_index.md
new file mode 100644
index 0000000..d6bf5f9
--- /dev/null
+++ b/content/software_other/ps2/trainkeitokei/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Simulator: Keisei, Toei Asakusa, Keikyu Lines"
+weight: 6
+---
+
+{{% software-page "ps2_trainkeitokei" %}}
diff --git a/content/software_other/ps2/trainmidosuji/_index.md b/content/software_other/ps2/trainmidosuji/_index.md
new file mode 100644
index 0000000..b17ebba
--- /dev/null
+++ b/content/software_other/ps2/trainmidosuji/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Simulator: Midosuji Line"
+weight: 3
+---
+
+{{% software-page "ps2_trainmidosuji" %}}
diff --git a/content/software_other/ps2/trainshinkansen/_index.md b/content/software_other/ps2/trainshinkansen/_index.md
new file mode 100644
index 0000000..18bb5ed
--- /dev/null
+++ b/content/software_other/ps2/trainshinkansen/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Simulator: Kyūshū Shinkansen"
+weight: 5
+---
+
+{{% software-page "ps2_trainshinkansen" %}}
diff --git a/content/software_other/ps2/trainyamanote/_index.md b/content/software_other/ps2/trainyamanote/_index.md
new file mode 100644
index 0000000..45cf362
--- /dev/null
+++ b/content/software_other/ps2/trainyamanote/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Train Simulator Real: THE Yamanote Line"
+weight: 1
+---
+
+{{% software-page "ps2_trainyamanote" %}}
diff --git a/data/controllers.yml b/data/controllers.yml
index a140619..01d8a55 100644
--- a/data/controllers.yml
+++ b/data/controllers.yml
@@ -1,3 +1,10 @@
+cotm02001:
+  name: "Train Mascon (Sony PlayStation 2)"
+  date: 2002-10-31
+  code: "COTM-02001"
+  image: "cotm02001.jpg"
+  ref: "/controllers/usb/cotm02001"
+
 dgc255:
   name: "One handle controller (PC)"
   date: 2004-12-17
@@ -41,7 +48,7 @@ sotp031201:
   code: "SOTP-031201"
   image: "sotp031201.jpg"
   ref: "/controllers/usb/sotp031201"
-  notes: "Released with 4 cassettes: P4-B7, P4-B7 (without B1), P5-B5 and P5-B8. Additional cassettes sold separarely: P5-B7 and P13-B7."
+  notes: "Released with 4 cassettes: P4-B7, P4-B7 (without B1), P5-B5 and P5-B8. Additional cassettes sold separately: P5-B7 and P13-B7."
 
 slph00051:
   name: "Two handle controller (Sony PlayStation)"
diff --git a/data/software.yml b/data/software.yml
index 62134ed..0445e89 100644
--- a/data/software.yml
+++ b/data/software.yml
@@ -201,8 +201,7 @@ ps2_densha3:
   controllers:
     - model: tcpp20002
     - model: sotp031201
-      partial: yes
-      notes: "Only P5/B8 cassette."
+      notes: "P5/B8 cassette."
     - model: tcpp20001
     - model: slph00051
     - model: tcpp20009
@@ -217,8 +216,7 @@ ps2_shinkansen:
   controllers:
     - model: tcpp20002
     - model: sotp031201
-      partial: yes
-      notes: "Only P5/B8 cassette."
+      notes: "P5/B8 cassette."
     - model: tcpp20001
     - model: tcpp20011
     - model: slph00051
@@ -236,8 +234,7 @@ ps2_ryojouhen:
       unofficial: yes
       adapter: ps2_cheats
     - model: sotp031201
-      partial: yes
-      notes: "Only P5/B8 cassette."
+      notes: "P5/B8 cassette."
     - model: tcpp20001
       unofficial: yes
       adapter: ps2_cheats
@@ -260,8 +257,7 @@ ps2_pro2:
       unofficial: yes
       adapter: ps2_cheats
     - model: sotp031201
-      partial: yes
-      notes: "Only P5/B8 cassette."
+      notes: "P5/B8 cassette."
     - model: tcpp20001
       unofficial: yes
       adapter: ps2_cheats
@@ -284,8 +280,7 @@ ps2_final:
       unofficial: yes
       adapter: ps2_cheats
     - model: sotp031201
-      partial: yes
-      notes: "Only P5/B8 cassette."
+      notes: "P5/B8 cassette."
     - model: tcpp20001
       unofficial: yes
       adapter: ps2_cheats
@@ -296,6 +291,69 @@ ps2_final:
       adapter: ps2_cheats
     - model: tcpp20009
 
+ps2_trainyamanote:
+  name: "Train Simulator Real: THE Yamanote Line"
+  namejp: "Train Simulator Real THE 山手線"
+  date: 2001-10-04
+  code: "SCPS-15018"
+  ref: "/software_other/ps2/trainyamanote"
+  controllers:
+    - model: sotp031201
+      notes: "P5/B8 cassette."
+    - model: tcpp20009
+
+ps2_trainkeihin:
+  name: "Train Simulator Real: THE Keihin Electric Express Railway"
+  namejp: "Train Simulator Real THE 京浜急行"
+  date: 2002-10-31
+  code: "SCPS-15035"
+  ref: "/software_other/ps2/trainkeihin"
+  controllers:
+    - model: sotp031201
+      notes: "P5/B5 cassette."
+    - model: cotm02001
+
+ps2_trainmidosuji:
+  name: "Train Simulator: Midosuji Line"
+  namejp: "Train Simulator 御堂筋線"
+  date: 2003-10-30
+  code: "SLPM-65386"
+  ref: "/software_other/ps2/trainmidosuji"
+  controllers:
+    - model: sotp031201
+      notes: "P4/B7 (without B1) cassette."
+
+ps2_traindensha:
+  name: "Train Simulator ＋ Densha de GO!: Tokyu Line"
+  namejp: "Train Simulator+電車でGO! 東京急行編"
+  date: 2003-12-18
+  code: "SLPM-65472"
+  ref: "/software_other/ps2/traindensha"
+  controllers:
+    - model: sotp031201
+      notes: "P4/B7 cassette."
+
+ps2_trainshinkansen:
+  name: "Train Simulator: Kyūshū Shinkansen"
+  namejp: "Train Simulator 京成・都営浅草・京急線"
+  date: 2005-08-25
+  code: "SLPM-67006"
+  ref: "/software_other/ps2/trainshinkansen"
+  controllers:
+    - model: sotp031201
+      notes: "P5/B7, P13-B7 cassettes."
+
+ps2_trainkeitokei:
+  name: "Train Simulator: Keisei, Toei Asakusa, Keikyu Lines"
+  namejp: "Train Simulator 九州新幹線"
+  date: 2005-10-01
+  code: "SLPM-67007"
+  ref: "/software_other/ps2/trainkeitokei"
+  controllers:
+    - model: sotp031201
+      notes: "P5/B5, P13-B7 cassettes."
+    - model: cotm02001
+
 ps4_yamanote:
   name: "Densha de GO! Hashirō Yamanote‑sen"
   namejp: "電車でGO!! はしろう山手線"
@@ -309,6 +367,7 @@ pc_bve:
   date: 2011-09-05
   url: "https://bvets.net/en/"
   notes: "Compatibility applies to version 5 or later."
+  ref: "/software_other/pc/bve"
   controllers:
     - model: tcpp20002
       notes: "Requires USB adapter."
@@ -336,6 +395,7 @@ pc_openbve:
   date: 2009-03-23
   url: "https://openbve-project.net/"
   notes: "Controllers are supported on version 1.8.2.0 or later via built-in input plugins."
+  ref: "/software_other/pc/openbve"
   controllers:
     - model: tcpp20002
       notes: "Requires USB adapter and calibration."
@@ -361,6 +421,15 @@ pc_openbve:
       notes: "Requires USB adapter and calibration."
     - model: tcpp20009
 
+pc_traincrew:
+  name: "Train Crew"
+  date: 2021-09-30
+  url: "https://acty-soft.com/traincrew/"
+  ref: "/software_other/pc/traincrew"
+  controllers:
+    - model: zkns001
+    - model: ohcpc01
+
 switch_yamanote:
   name: "Densha de GO! Hashirō Yamanote‑sen"
   namejp: "電車でGO!! はしろう山手線"
diff --git a/static/images/controllers/cotm02001.jpg b/static/images/controllers/cotm02001.jpg
new file mode 100644
index 0000000..21689df
Binary files /dev/null and b/static/images/controllers/cotm02001.jpg differ