Fix some bugs and Reinforce Feature Selection