upgraded classification models and sim calculation code; runs faster. Bug resolved.