too much at once: fix refit/simulate/naming issues

fixes #158