Fix prediction fitting and add feature selection

Fix prediction fitting and add feature selection