Fixed some bugs( error or conflict warning ) and try to do code-generation