fixed issues with feature selection - still slow - needs speed up
fixed merge conflicts