1.6 preparations for new model, and several speed improvements