minor corrections, model runs, output ok