diff --git a/CMBW-maps/melee/2v2/Needs Testing/(4)Charnel House.scx b/CMBW-maps/melee/2v2/Needs Testing/(4)Charnel House.scx
deleted file mode 100644
index e1ff4065..00000000
Binary files a/CMBW-maps/melee/2v2/Needs Testing/(4)Charnel House.scx and /dev/null differ
diff --git a/CMBW-maps/melee/2v2/Nonstandard/(4)Charnel House.scx b/CMBW-maps/melee/2v2/Nonstandard/(4)Charnel House.scx
new file mode 100644
index 00000000..7421f180
Binary files /dev/null and b/CMBW-maps/melee/2v2/Nonstandard/(4)Charnel House.scx differ
diff --git a/mpq/unit/terran/goliathT.grp b/mpq/unit/terran/goliathT.grp
index a27fb76d..76597f40 100644
Binary files a/mpq/unit/terran/goliathT.grp and b/mpq/unit/terran/goliathT.grp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index f21767b7..88e2146d 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ