haxe3 only, cleanup, some bug fixed, code generation changed a bit