Even more model fixing, speed improvements