diff --git a/cocos2dx/base_nodes/CCNode.h b/cocos2dx/base_nodes/CCNode.h
index 655581422b..dce82279a1 100644
--- a/cocos2dx/base_nodes/CCNode.h
+++ b/cocos2dx/base_nodes/CCNode.h
@@ -1424,8 +1424,8 @@ public:
     virtual bool isCascadeColorEnabled();
     virtual void setCascadeColorEnabled(bool cascadeColorEnabled);
     
-    virtual void setOpacityModifyRGB(bool bValue) = 0;
-    virtual bool isOpacityModifyRGB() = 0;
+    virtual void setOpacityModifyRGB(bool bValue) {};
+    virtual bool isOpacityModifyRGB() { return false; };
 
 protected:
 	GLubyte		_displayedOpacity;
diff --git a/cocos2dx/label_nodes/CCLabelTTF.cpp b/cocos2dx/label_nodes/CCLabelTTF.cpp
index 43e7b2c45c..e7707164de 100644
--- a/cocos2dx/label_nodes/CCLabelTTF.cpp
+++ b/cocos2dx/label_nodes/CCLabelTTF.cpp
@@ -53,11 +53,6 @@ CCLabelTTF::~CCLabelTTF()
     CC_SAFE_DELETE(m_pFontName);
 }
 
-CCLabelTTF * CCLabelTTF::node()
-{
-    return CCLabelTTF::create();
-}
-
 CCLabelTTF * CCLabelTTF::create()
 {
     CCLabelTTF * pRet = new CCLabelTTF();
diff --git a/cocos2dx/label_nodes/CCLabelTTF.h b/cocos2dx/label_nodes/CCLabelTTF.h
index 096f30e29d..01ddea119a 100644
--- a/cocos2dx/label_nodes/CCLabelTTF.h
+++ b/cocos2dx/label_nodes/CCLabelTTF.h
@@ -82,9 +82,6 @@ public:
     
     /** initializes the CCLabelTTF */
     bool init();
-    /** Creates an label.
-     */
-    static CCLabelTTF * node();
 
     /** Creates an label.
      */
diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
index 4fd5b850b7..7a86733b44 100644
--- a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
+++ b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
@@ -653,11 +653,6 @@ void CCLayerColor::setBlendFunc(ccBlendFunc var)
     m_tBlendFunc = var;
 }
 
-CCLayerColor* CCLayerColor::node()
-{
-    return CCLayerColor::create();
-}
-
 CCLayerColor* CCLayerColor::create()
 {
     CCLayerColor* pRet = new CCLayerColor();
@@ -833,11 +828,6 @@ CCLayerGradient* CCLayerGradient::create(const ccColor4B& start, const ccColor4B
     return NULL;
 }
 
-CCLayerGradient* CCLayerGradient::node()
-{
-    return CCLayerGradient::create();
-}
-
 CCLayerGradient* CCLayerGradient::create()
 {
     CCLayerGradient* pRet = new CCLayerGradient();
diff --git a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
index 7dce49f899..6324255129 100644
--- a/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
+++ b/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
@@ -226,9 +226,6 @@ public:
 
     virtual void draw();
     virtual void setContentSize(const CCSize & var);
-
-    //@deprecated: This interface will be deprecated sooner or later.
-    static CCLayerColor* node();
     
     static CCLayerColor* create();
     
@@ -317,9 +314,6 @@ protected:
 public:
     virtual void setCompressedInterpolation(bool bCompressedInterpolation);
     virtual bool isCompressedInterpolation();
-
-    //@deprecated: This interface will be deprecated sooner or later.
-    static CCLayerGradient* node();
     
     static CCLayerGradient* create();
 
diff --git a/tools/tojs/cocos2dx-win32.ini b/tools/tojs/cocos2dx-win32.ini
index a384a4539f..2db75a59e1 100644
--- a/tools/tojs/cocos2dx-win32.ini
+++ b/tools/tojs/cocos2dx-win32.ini
@@ -23,7 +23,7 @@ headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/CocosDenshion/inc
 
 # what classes to produce code for. You can use regular expressions here. When testing the regular
 # expression, it will be enclosed in "^$", like this: "^CCMenu*$".
-classes = CCSprite.* CCScene CCNode CCDirector CCLayer.* CCMenu.* CCTouch CC.*Action.* CCMove.* CCRotate.* CCBlink.* CCTint.* CCSequence CCRepeat.* CCFade.* CCEase.* CCScale.* CCTransition.* CCSpawn CCSequence CCAnimat.* CCFlip.* CCDelay.* CCSkew.* CCJump.* CCPlace.* CCShow.* CCProgress.* CCPointArray CCToggleVisibility.* CCHide CCParticle.* CCLabel.* CCAtlas.* CCTextureCache.* CCTexture2D CCCardinal.* CCCatmullRom.* CCParallaxNode CCTileMap.* CCTMX.* CCCallFunc CCRenderTexture CCGridAction CCGrid3DAction CCShaky3D CCWaves3D CCFlipX3D CCFlipY3D CCSpeed CCActionManager CCBReader.* CCBAnimationManager.* CCSet SimpleAudioEngine CCScheduler CCTimer CCOrbit.* CCFollow.* CCBezier.* CCCardinalSpline.* CCControlButton.* CCCamera.* CCDrawNode CC.*3D$ CCLiquid$ CCWaves$ CCShuffleTiles$ CCTurnOffTiles$ CCSplit.* CCTwirl$ 
+classes = CCSprite.* CCScene CCNode.* CCDirector CCLayer.* CCMenu.* CCTouch CC.*Action.* CCMove.* CCRotate.* CCBlink.* CCTint.* CCSequence CCRepeat.* CCFade.* CCEase.* CCScale.* CCTransition.* CCSpawn CCSequence CCAnimat.* CCFlip.* CCDelay.* CCSkew.* CCJump.* CCPlace.* CCShow.* CCProgress.* CCPointArray CCToggleVisibility.* CCHide CCParticle.* CCLabel.* CCAtlas.* CCTextureCache.* CCTexture2D CCCardinal.* CCCatmullRom.* CCParallaxNode CCTileMap.* CCTMX.* CCCallFunc CCRenderTexture CCGridAction CCGrid3DAction CCShaky3D CCWaves3D CCFlipX3D CCFlipY3D CCSpeed CCActionManager CCBReader.* CCBAnimationManager.* CCSet SimpleAudioEngine CCScheduler CCTimer CCOrbit.* CCFollow.* CCBezier.* CCCardinalSpline.* CCControlButton.* CCCamera.* CCDrawNode CC.*3D$ CCLiquid$ CCWaves$ CCShuffleTiles$ CCTurnOffTiles$ CCSplit.* CCTwirl$ CCFileUtils$ CCScrollView$ CCTableView$ CCTableViewCell$
 
 # what should we skip? in the format ClassName::[function function]
 # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
@@ -33,98 +33,101 @@ classes = CCSprite.* CCScene CCNode CCDirector CCLayer.* CCMenu.* CCTouch CC.*Ac
 # functions from all classes.
 
 skip = CCNode::[.*Transform convertToWindowSpace getChildren ^setPosition$ getGrid setGLServerState description getShaderProgram getUserObject .*UserData getGLServerState unscheduleAllSelectors],
-		CCSprite::[getQuad displayFrame getBlendFunc ^setPosition$ setBlendFunc setSpriteBatchNode getSpriteBatchNode],
-		CCSpriteBatchNode::[getBlendFunc setBlendFunc],
-		CCMotionStreak::[getBlendFunc setBlendFunc],
-		CCAtlasNode::[getBlendFunc setBlendFunc],
-		CCParticleBatchNode::[getBlendFunc setBlendFunc],
-		CCLayerColor::[getBlendFunc setBlendFunc],
-		CCParticleSystem::[getBlendFunc setBlendFunc],
-		CCDrawNode::[getBlendFunc setBlendFunc drawPolygon],
- 		CCDirector::[getAccelerometer getKeypadDispatcher getTouchDispatcher setWatcherCallbackFun getOpenGLView getProjection],
-		CCLayer.*::[didAccelerate (g|s)etBlendFunc],
-		CCMenu.*::[.*Target getSubItems create initWithItems alignItemsInRows alignItemsInColumns],
-		CCMenuItem.*::[create],
-		CCRGBAProtocol::[*],
-		CCCopying::[*],
-		CC.*Protocol::[*],
-		CC.*Delegate::[*],
-		CCPoolManager::[*],
-		CCTexture2D::[initWithPVRTCData addPVRTCImage releaseData setTexParameters initWithData keepData],
-		CCSet::[begin end],
-		CCIMEDispatcher::[*],
-		CCSAXParser::[*],
-		CCThread::[*],
-		CCProfiler::[*],
-		CCProfilingTimer::[*],
-		CCCallFunc::[create],
-		CCSAXDelegator::[*],
-		CCColor3bObject::[*],
-		CCTouchDispatcher::[*],
-		EGLTouchDelegate::[*],
-		CCScriptEngineManager::[*],
-		CCKeypadHandler::[*],
-		CCInvocation::[*],
-		CCEGLView::[*],
-		CCSchedulerScriptHandlerEntry::[*],
-		CCSize::[*],
-		CCPoint::[*],
-		CCPointArray::[*],
-		CCRect::[*],
-		CCString::[*],
-		CCDictionary::[*],
-		CCArray::[*],
-		CCRange::[*],
-		CCNotificationObserver::[*],
-		CCListView.*::[*],
-		CCImage::[initWithString initWithImageData],
-		CCSequence::[create],
-		CCSpawn::[create],
-		CCAnimation::[create],
-		CCGrid3DAction::[create actionWith.*],
-		CCTiledGrid3DAction::[create actionWith.*],
-		CCTMXMapInfo::[startElement endElement textHandler],
-		CCParticleSystemQuad::[postStep setBatchNode draw setTexture$ setTotalParticles updateQuadWithParticle setupIndices listenBackToForeground initWithTotalParticles particleWithFile node],
-		CCLayerMultiplex::[create layerWith.* initWithLayers],
-		CCCatmullRom.*::[create actionWithDuration],
-		CCBezier.*::[create actionWithDuration],
-		CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers],
-		CCBAnimationManager::[setAnimationCompletedCallback],
-		CCCardinalSpline.*::[create actionWithDuration setPoints],
-		CCScheduler::[pause resume unscheduleAllSelectorsForTarget],
-	        CCTextureCache::[addPVRTCImage],
-	        CCTimer::[getSelector],
-		CC.*Loader$::[*],
-		*::[copyWith.* onEnter.* onExit.* description getObjectType .*RGB.* .*HSV.*],
-		CCFileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$]
+        CCSprite::[getQuad displayFrame getBlendFunc ^setPosition$ setBlendFunc setSpriteBatchNode getSpriteBatchNode],
+        CCSpriteBatchNode::[getBlendFunc setBlendFunc],
+        CCMotionStreak::[getBlendFunc setBlendFunc],
+        CCAtlasNode::[getBlendFunc setBlendFunc],
+        CCParticleBatchNode::[getBlendFunc setBlendFunc],
+        CCLayerColor::[getBlendFunc setBlendFunc],
+        CCParticleSystem::[getBlendFunc setBlendFunc],
+        CCDrawNode::[getBlendFunc setBlendFunc drawPolygon],
+        CCDirector::[getAccelerometer getKeypadDispatcher getTouchDispatcher setWatcherCallbackFun getOpenGLView getProjection getClassTypeInfo],
+        CCLayer.*::[didAccelerate (g|s)etBlendFunc],
+        CCMenu.*::[.*Target getSubItems create initWithItems alignItemsInRows alignItemsInColumns],
+        CCMenuItem.*::[create],
+        CCRGBAProtocol::[*],
+        CCCopying::[*],
+        CC.*Protocol::[*],
+        CC.*Delegate::[*],
+        CCPoolManager::[*],
+        CCTexture2D::[initWithPVRTCData addPVRTCImage releaseData setTexParameters initWithData keepData],
+        CCSet::[begin end],
+        CCIMEDispatcher::[*],
+        CCSAXParser::[*],
+        CCThread::[*],
+        CCProfiler::[*],
+        CCProfilingTimer::[*],
+        CCCallFunc::[create],
+        CCSAXDelegator::[*],
+        CCColor3bObject::[*],
+        CCTouchDispatcher::[*],
+        EGLTouchDelegate::[*],
+        CCScriptEngineManager::[*],
+        CCKeypadHandler::[*],
+        CCInvocation::[*],
+        CCEGLView::[*],
+        CCSchedulerScriptHandlerEntry::[*],
+        CCSize::[*],
+        CCPoint::[*],
+        CCPointArray::[*],
+        CCRect::[*],
+        CCString::[*],
+        CCDictionary::[*],
+        CCArray::[*],
+        CCRange::[*],
+        CCNotificationObserver::[*],
+        CCListView.*::[*],
+        CCImage::[initWithString initWithImageData],
+        CCSequence::[create],
+        CCSpawn::[create],
+        CCAnimation::[create],
+        CCGrid3DAction::[create actionWith.*],
+        CCTiledGrid3DAction::[create actionWith.*],
+        CCTMXMapInfo::[startElement endElement textHandler],
+        CCParticleSystemQuad::[postStep setBatchNode draw setTexture$ setTotalParticles updateQuadWithParticle setupIndices listenBackToForeground initWithTotalParticles particleWithFile node],
+        CCLayerMultiplex::[create layerWith.* initWithLayers],
+        CCCatmullRom.*::[create actionWithDuration],
+        CCBezier.*::[create actionWithDuration],
+        CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers],
+        CCBAnimationManager::[setAnimationCompletedCallback],
+        CCCardinalSpline.*::[create actionWithDuration setPoints],
+        CCScheduler::[pause resume unscheduleAllSelectorsForTarget],
+        CCTextureCache::[addPVRTCImage],
+        CCTimer::[getSelector],
+        CC.*Loader.*::[*],
+        *::[copyWith.* onEnter.* onExit.* description getObjectType .*RGB.* .*HSV.*],
+        CCFileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getClassTypeInfo],
+        SimpleAudioEngine::[getClassTypeInfo],
+        CCScrollView::[(g|s)etDelegate$],
+        CCTableView::[create (g|s)etDataSource$ (g|s)etDelegate]
 
 rename_functions = CCDirector::[sharedDirector=getInstance],
-	CCSpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY],
-	CCMenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize fontSizeObj=fontSize fontNameObj=fontName],
-	CCProgressTimer::[setReverseProgress=setReverseDirection],
-	CCTextureCache::[sharedTextureCache=getInstance],
-	CCAnimation::[addSpriteFrameWithFileName=addSpriteFrameWithFile],
-	CCAnimationCache::[sharedAnimationCache=getInstance addAnimationsWithFile=addAnimations animationByName=getAnimation removeAnimationByName=removeAnimation],
-	CCLayerGradient::[initWithColor=init],
-	CCLayerColor::[initWithColor=init],
-	CCNode::[boundingBox=getBoundingBox removeFromParentAndCleanup=removeFromParent removeAllChildrenWithCleanup=removeAllChildren],
-	CCLabelAtlas::[create=_create],
-	CCTMXLayer::[tileAt=getTileAt tileGIDAt=getTileGIDAt propertyNamed=getProperty],
-	CCTileMapAtlas::[tileAt=getTileAt],
-	CCSprite::[isFlipX=isFlippedX isFlipY=isFlippedY],
-	CCTouch::[getID=getId],
-	CCScheduler::[unscheduleAllSelectorsForTarget=unscheduleAllCallbacksForTarget unscheduleAll=unscheduleAllCallbacks],
-	SimpleAudioEngine::[sharedEngine=getInstance preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic],
-	CCCamera.*::[setUpXYZ=setUp getUpXYZ=getUp setEyeXYZ=setEye getEyeXYZ=getEye setCenterXYZ=setCenter getCenterXYZ=getCenter],
-	CCBReader::[getAnimationManager=getActionManager setAnimationManager=setActionManager],
-	CCTMXTiledMap::[layerNamed=getLayer objectGroupNamed=getObjectGroup propertyNamed=getProperty],
-	CCTexture2D::[defaultAlphaPixelFormat=getDefaultAlphaPixelFormat],
-	CCFileUtils::[sharedFileUtils=getInstance loadFilenameLookupDictionaryFromFile=loadFilenameLookup]
+    CCSpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY],
+    CCMenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize fontSizeObj=fontSize fontNameObj=fontName],
+    CCProgressTimer::[setReverseProgress=setReverseDirection],
+    CCTextureCache::[sharedTextureCache=getInstance],
+    CCAnimation::[addSpriteFrameWithFileName=addSpriteFrameWithFile],
+    CCAnimationCache::[sharedAnimationCache=getInstance addAnimationsWithFile=addAnimations animationByName=getAnimation removeAnimationByName=removeAnimation],
+    CCLayerGradient::[initWithColor=init],
+    CCLayerColor::[initWithColor=init],
+    CCNode::[boundingBox=getBoundingBox removeFromParentAndCleanup=removeFromParent removeAllChildrenWithCleanup=removeAllChildren],
+    CCLabelAtlas::[create=_create],
+    CCTMXLayer::[tileAt=getTileAt tileGIDAt=getTileGIDAt propertyNamed=getProperty],
+    CCTileMapAtlas::[tileAt=getTileAt],
+    CCSprite::[isFlipX=isFlippedX isFlipY=isFlippedY],
+    CCTouch::[getID=getId],
+    CCScheduler::[unscheduleAllSelectorsForTarget=unscheduleAllCallbacksForTarget unscheduleAll=unscheduleAllCallbacks],
+    SimpleAudioEngine::[sharedEngine=getInstance preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic],
+    CCCamera.*::[setUpXYZ=setUp getUpXYZ=getUp setEyeXYZ=setEye getEyeXYZ=getEye setCenterXYZ=setCenter getCenterXYZ=getCenter],
+    CCBReader::[getAnimationManager=getActionManager setAnimationManager=setActionManager],
+    CCTMXTiledMap::[layerNamed=getLayer objectGroupNamed=getObjectGroup propertyNamed=getProperty],
+    CCTexture2D::[defaultAlphaPixelFormat=getDefaultAlphaPixelFormat],
+    CCFileUtils::[sharedFileUtils=getInstance loadFilenameLookupDictionaryFromFile=loadFilenameLookup]
 
 rename_classes = CCParticleSystemQuad::CCParticleSystem,
-	       SimpleAudioEngine::AudioEngine,
-	       CCBReader::CC_Reader,
-	       CCBAnimationManager::CCAnimationManager
+           SimpleAudioEngine::AudioEngine,
+           CCBReader::CC_Reader,
+           CCBAnimationManager::CCAnimationManager
 
 # for all class names, should we remove something when registering in the target VM?
 remove_prefix = CC
diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini
index 06f461b335..1717d3408a 100644
--- a/tools/tojs/cocos2dx.ini
+++ b/tools/tojs/cocos2dx.ini
@@ -26,7 +26,7 @@ headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/CocosDenshion/inc
 
 # what classes to produce code for. You can use regular expressions here. When testing the regular
 # expression, it will be enclosed in "^$", like this: "^CCMenu*$".
-classes = CCSprite.* CCScene CCNode CCDirector CCLayer.* CCMenu.* CCTouch CC.*Action.* CCMove.* CCRotate.* CCBlink.* CCTint.* CCSequence CCRepeat.* CCFade.* CCEase.* CCScale.* CCTransition.* CCSpawn CCSequence CCAnimat.* CCFlip.* CCDelay.* CCSkew.* CCJump.* CCPlace.* CCShow.* CCProgress.* CCPointArray CCToggleVisibility.* CCHide CCParticle.* CCLabel.* CCAtlas.* CCTextureCache.* CCTexture2D CCCardinal.* CCCatmullRom.* CCParallaxNode CCTileMap.* CCTMX.* CCCallFunc CCRenderTexture CCGridAction CCGrid3DAction CCShaky3D CCWaves3D CCFlipX3D CCFlipY3D CCSpeed CCActionManager CCBReader.* CCBAnimationManager.* CCSet SimpleAudioEngine CCScheduler CCTimer CCOrbit.* CCFollow.* CCBezier.* CCCardinalSpline.* CCControlButton.* CCCamera.* CCDrawNode CC.*3D$ CCLiquid$ CCWaves$ CCShuffleTiles$ CCTurnOffTiles$ CCSplit.* CCTwirl$ CCFileUtils$ CCScrollView$ CCTableView$ CCTableViewCell$
+classes = CCSprite.* CCScene CCNode.* CCDirector CCLayer.* CCMenu.* CCTouch CC.*Action.* CCMove.* CCRotate.* CCBlink.* CCTint.* CCSequence CCRepeat.* CCFade.* CCEase.* CCScale.* CCTransition.* CCSpawn CCSequence CCAnimat.* CCFlip.* CCDelay.* CCSkew.* CCJump.* CCPlace.* CCShow.* CCProgress.* CCPointArray CCToggleVisibility.* CCHide CCParticle.* CCLabel.* CCAtlas.* CCTextureCache.* CCTexture2D CCCardinal.* CCCatmullRom.* CCParallaxNode CCTileMap.* CCTMX.* CCCallFunc CCRenderTexture CCGridAction CCGrid3DAction CCShaky3D CCWaves3D CCFlipX3D CCFlipY3D CCSpeed CCActionManager CCBReader.* CCBAnimationManager.* CCSet SimpleAudioEngine CCScheduler CCTimer CCOrbit.* CCFollow.* CCBezier.* CCCardinalSpline.* CCControlButton.* CCCamera.* CCDrawNode CC.*3D$ CCLiquid$ CCWaves$ CCShuffleTiles$ CCTurnOffTiles$ CCSplit.* CCTwirl$ CCFileUtils$ CCScrollView$ CCTableView$ CCTableViewCell$
 
 # what should we skip? in the format ClassName::[function function]
 # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
@@ -36,100 +36,101 @@ classes = CCSprite.* CCScene CCNode CCDirector CCLayer.* CCMenu.* CCTouch CC.*Ac
 # functions from all classes.
 
 skip = CCNode::[.*Transform convertToWindowSpace getChildren ^setPosition$ getGrid setGLServerState description getShaderProgram getUserObject .*UserData getGLServerState unscheduleAllSelectors],
-		CCSprite::[getQuad displayFrame getBlendFunc ^setPosition$ setBlendFunc setSpriteBatchNode getSpriteBatchNode],
-		CCSpriteBatchNode::[getBlendFunc setBlendFunc],
-		CCMotionStreak::[getBlendFunc setBlendFunc],
-		CCAtlasNode::[getBlendFunc setBlendFunc],
-		CCParticleBatchNode::[getBlendFunc setBlendFunc],
-		CCLayerColor::[getBlendFunc setBlendFunc],
-		CCParticleSystem::[getBlendFunc setBlendFunc],
-		CCDrawNode::[getBlendFunc setBlendFunc drawPolygon],
- 		CCDirector::[getAccelerometer getKeypadDispatcher getTouchDispatcher setWatcherCallbackFun getOpenGLView getProjection],
-		CCLayer.*::[didAccelerate (g|s)etBlendFunc],
-		CCMenu.*::[.*Target getSubItems create initWithItems alignItemsInRows alignItemsInColumns],
-		CCMenuItem.*::[create],
-		CCRGBAProtocol::[*],
-		CCCopying::[*],
-		CC.*Protocol::[*],
-		CC.*Delegate::[*],
-		CCPoolManager::[*],
-		CCTexture2D::[initWithPVRTCData addPVRTCImage releaseData setTexParameters initWithData keepData],
-		CCSet::[begin end],
-		CCIMEDispatcher::[*],
-		CCSAXParser::[*],
-		CCThread::[*],
-		CCProfiler::[*],
-		CCProfilingTimer::[*],
-		CCCallFunc::[create],
-		CCSAXDelegator::[*],
-		CCColor3bObject::[*],
-		CCTouchDispatcher::[*],
-		EGLTouchDelegate::[*],
-		CCScriptEngineManager::[*],
-		CCKeypadHandler::[*],
-		CCInvocation::[*],
-		CCEGLView::[*],
-		CCSchedulerScriptHandlerEntry::[*],
-		CCSize::[*],
-		CCPoint::[*],
-		CCPointArray::[*],
-		CCRect::[*],
-		CCString::[*],
-		CCDictionary::[*],
-		CCArray::[*],
-		CCRange::[*],
-		CCNotificationObserver::[*],
-		CCListView.*::[*],
-		CCImage::[initWithString initWithImageData],
-		CCSequence::[create],
-		CCSpawn::[create],
-		CCAnimation::[create],
-		CCGrid3DAction::[create actionWith.*],
-		CCTiledGrid3DAction::[create actionWith.*],
-		CCTMXMapInfo::[startElement endElement textHandler],
-		CCParticleSystemQuad::[postStep setBatchNode draw setTexture$ setTotalParticles updateQuadWithParticle setupIndices listenBackToForeground initWithTotalParticles particleWithFile node],
-		CCLayerMultiplex::[create layerWith.* initWithLayers],
-		CCCatmullRom.*::[create actionWithDuration],
-		CCBezier.*::[create actionWithDuration],
-		CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers],
-		CCBAnimationManager::[setAnimationCompletedCallback],
-		CCCardinalSpline.*::[create actionWithDuration setPoints],
-		CCScheduler::[pause resume unscheduleAllSelectorsForTarget],
-	        CCTextureCache::[addPVRTCImage],
-	        CCTimer::[getSelector],
-		CC.*Loader$::[*],
-		*::[copyWith.* onEnter.* onExit.* description getObjectType .*RGB.* .*HSV.*],
-		CCFileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$],
-		CCScrollView::[(g|s)etDelegate$],
-		CCTableView::[create (g|s)etDataSource$ (g|s)etDelegate]
+        CCSprite::[getQuad displayFrame getBlendFunc ^setPosition$ setBlendFunc setSpriteBatchNode getSpriteBatchNode],
+        CCSpriteBatchNode::[getBlendFunc setBlendFunc],
+        CCMotionStreak::[getBlendFunc setBlendFunc],
+        CCAtlasNode::[getBlendFunc setBlendFunc],
+        CCParticleBatchNode::[getBlendFunc setBlendFunc],
+        CCLayerColor::[getBlendFunc setBlendFunc],
+        CCParticleSystem::[getBlendFunc setBlendFunc],
+        CCDrawNode::[getBlendFunc setBlendFunc drawPolygon],
+        CCDirector::[getAccelerometer getKeypadDispatcher getTouchDispatcher setWatcherCallbackFun getOpenGLView getProjection getClassTypeInfo],
+        CCLayer.*::[didAccelerate (g|s)etBlendFunc],
+        CCMenu.*::[.*Target getSubItems create initWithItems alignItemsInRows alignItemsInColumns],
+        CCMenuItem.*::[create],
+        CCRGBAProtocol::[*],
+        CCCopying::[*],
+        CC.*Protocol::[*],
+        CC.*Delegate::[*],
+        CCPoolManager::[*],
+        CCTexture2D::[initWithPVRTCData addPVRTCImage releaseData setTexParameters initWithData keepData],
+        CCSet::[begin end],
+        CCIMEDispatcher::[*],
+        CCSAXParser::[*],
+        CCThread::[*],
+        CCProfiler::[*],
+        CCProfilingTimer::[*],
+        CCCallFunc::[create],
+        CCSAXDelegator::[*],
+        CCColor3bObject::[*],
+        CCTouchDispatcher::[*],
+        EGLTouchDelegate::[*],
+        CCScriptEngineManager::[*],
+        CCKeypadHandler::[*],
+        CCInvocation::[*],
+        CCEGLView::[*],
+        CCSchedulerScriptHandlerEntry::[*],
+        CCSize::[*],
+        CCPoint::[*],
+        CCPointArray::[*],
+        CCRect::[*],
+        CCString::[*],
+        CCDictionary::[*],
+        CCArray::[*],
+        CCRange::[*],
+        CCNotificationObserver::[*],
+        CCListView.*::[*],
+        CCImage::[initWithString initWithImageData],
+        CCSequence::[create],
+        CCSpawn::[create],
+        CCAnimation::[create],
+        CCGrid3DAction::[create actionWith.*],
+        CCTiledGrid3DAction::[create actionWith.*],
+        CCTMXMapInfo::[startElement endElement textHandler],
+        CCParticleSystemQuad::[postStep setBatchNode draw setTexture$ setTotalParticles updateQuadWithParticle setupIndices listenBackToForeground initWithTotalParticles particleWithFile node],
+        CCLayerMultiplex::[create layerWith.* initWithLayers],
+        CCCatmullRom.*::[create actionWithDuration],
+        CCBezier.*::[create actionWithDuration],
+        CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers],
+        CCBAnimationManager::[setAnimationCompletedCallback],
+        CCCardinalSpline.*::[create actionWithDuration setPoints],
+        CCScheduler::[pause resume unscheduleAllSelectorsForTarget],
+        CCTextureCache::[addPVRTCImage],
+        CCTimer::[getSelector],
+        CC.*Loader.*::[*],
+        *::[copyWith.* onEnter.* onExit.* description getObjectType .*RGB.* .*HSV.*],
+        CCFileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getClassTypeInfo],
+        SimpleAudioEngine::[getClassTypeInfo],
+        CCScrollView::[(g|s)etDelegate$],
+        CCTableView::[create (g|s)etDataSource$ (g|s)etDelegate]
 
 rename_functions = CCDirector::[sharedDirector=getInstance],
-	CCSpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY],
-	CCMenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize fontSizeObj=fontSize fontNameObj=fontName],
-	CCProgressTimer::[setReverseProgress=setReverseDirection],
-	CCTextureCache::[sharedTextureCache=getInstance],
-	CCAnimation::[addSpriteFrameWithFileName=addSpriteFrameWithFile],
-	CCAnimationCache::[sharedAnimationCache=getInstance addAnimationsWithFile=addAnimations animationByName=getAnimation removeAnimationByName=removeAnimation],
-	CCLayerGradient::[initWithColor=init],
-	CCLayerColor::[initWithColor=init],
-	CCNode::[boundingBox=getBoundingBox removeFromParentAndCleanup=removeFromParent removeAllChildrenWithCleanup=removeAllChildren],
-	CCLabelAtlas::[create=_create],
-	CCTMXLayer::[tileAt=getTileAt tileGIDAt=getTileGIDAt propertyNamed=getProperty],
-	CCTileMapAtlas::[tileAt=getTileAt],
-	CCSprite::[isFlipX=isFlippedX isFlipY=isFlippedY],
-	CCTouch::[getID=getId],
-	CCScheduler::[unscheduleAllSelectorsForTarget=unscheduleAllCallbacksForTarget unscheduleAll=unscheduleAllCallbacks],
-	SimpleAudioEngine::[sharedEngine=getInstance preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic],
-	CCCamera.*::[setUpXYZ=setUp getUpXYZ=getUp setEyeXYZ=setEye getEyeXYZ=getEye setCenterXYZ=setCenter getCenterXYZ=getCenter],
-	CCBReader::[getAnimationManager=getActionManager setAnimationManager=setActionManager],
-	CCTMXTiledMap::[layerNamed=getLayer objectGroupNamed=getObjectGroup propertyNamed=getProperty],
-	CCTexture2D::[defaultAlphaPixelFormat=getDefaultAlphaPixelFormat],
-	CCFileUtils::[sharedFileUtils=getInstance loadFilenameLookupDictionaryFromFile=loadFilenameLookup]
+    CCSpriteFrameCache::[sharedSpriteFrameCache=getInstance addSpriteFramesWithFile=addSpriteFrames spriteFrameByName=getSpriteFrame isFlipX=isFlippedX isFlipY=isFlippedY],
+    CCMenuItemFont::[setFontNameObj=setFontName setFontSizeObj=setFontSize fontSizeObj=fontSize fontNameObj=fontName],
+    CCProgressTimer::[setReverseProgress=setReverseDirection],
+    CCTextureCache::[sharedTextureCache=getInstance],
+    CCAnimation::[addSpriteFrameWithFileName=addSpriteFrameWithFile],
+    CCAnimationCache::[sharedAnimationCache=getInstance addAnimationsWithFile=addAnimations animationByName=getAnimation removeAnimationByName=removeAnimation],
+    CCLayerGradient::[initWithColor=init],
+    CCLayerColor::[initWithColor=init],
+    CCNode::[boundingBox=getBoundingBox removeFromParentAndCleanup=removeFromParent removeAllChildrenWithCleanup=removeAllChildren],
+    CCLabelAtlas::[create=_create],
+    CCTMXLayer::[tileAt=getTileAt tileGIDAt=getTileGIDAt propertyNamed=getProperty],
+    CCTileMapAtlas::[tileAt=getTileAt],
+    CCSprite::[isFlipX=isFlippedX isFlipY=isFlippedY],
+    CCTouch::[getID=getId],
+    CCScheduler::[unscheduleAllSelectorsForTarget=unscheduleAllCallbacksForTarget unscheduleAll=unscheduleAllCallbacks],
+    SimpleAudioEngine::[sharedEngine=getInstance preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic],
+    CCCamera.*::[setUpXYZ=setUp getUpXYZ=getUp setEyeXYZ=setEye getEyeXYZ=getEye setCenterXYZ=setCenter getCenterXYZ=getCenter],
+    CCBReader::[getAnimationManager=getActionManager setAnimationManager=setActionManager],
+    CCTMXTiledMap::[layerNamed=getLayer objectGroupNamed=getObjectGroup propertyNamed=getProperty],
+    CCTexture2D::[defaultAlphaPixelFormat=getDefaultAlphaPixelFormat],
+    CCFileUtils::[sharedFileUtils=getInstance loadFilenameLookupDictionaryFromFile=loadFilenameLookup]
 
 rename_classes = CCParticleSystemQuad::CCParticleSystem,
-	       SimpleAudioEngine::AudioEngine,
-	       CCBReader::CC_Reader,
-	       CCBAnimationManager::CCAnimationManager
+           SimpleAudioEngine::AudioEngine,
+           CCBReader::CC_Reader,
+           CCBAnimationManager::CCAnimationManager
 
 # for all class names, should we remove something when registering in the target VM?
 remove_prefix = CC