incremental fix, 1st commit was working copy in poor shape