Updates and fixes to modeling scripts