diff --git a/README.md b/README.md
index cc24b58..cda3a20 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,22 @@ hscript-improved
 
 How to install
 ```
-haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved.git
+haxelib git hscript-improved https://github.com/CodenameCrew/hscript-improved.git
 ```
 
 To enable custom classes support you have to do this in project.xml
+
 ```xml
 <define name="CUSTOM_CLASSES" />
 ```
-Warning: custom classes are sometimes broken, would like help to fix them. You can only override functions from the current class, not from the extended part, like you cant override update in FlxText because FlxText doesnt have a update function overriden
+
+or set this in build.hxml
+
+```hxml
+-D CUSTOM_CLASSES
+```
+
+Warning: custom class system is still in development, would like help to test it. For now, you can only override functions from the current class, not from the extended part, like you cant override update in FlxText because FlxText doesnt have a update function overriden. Also you cannot create custom classes that extends a typed class (those ones that has `<T>`), this will be implemented in the future.
 
 -----------
 
diff --git a/hscript/CustomClass.hx b/hscript/CustomClass.hx
index bd81652..9304c40 100644
--- a/hscript/CustomClass.hx
+++ b/hscript/CustomClass.hx
@@ -5,8 +5,6 @@ import haxe.Constraints.Function;
 
 using Lambda;
 
-// TODO
-
 /**
  * The Custom Class core.
  *