fix redeclare bug
add some class files to extends
fix some bugs