all model-code update/fixed other bugs; 2