Version 1.0.2: fixed a few more model-assuming errors