Fix - don't compute LSI before model selection, and proper selection of num_features