Some more logging fixes
A few bug fixes for -s
More bug fixes: finally runs with -s!
Logging fixes
More bug fixes: residue adding to model should be fine now (3hbx works)