Bug fixes for Biomodel models import, CMake fixed

Other minor changes needed for the demo