undo error introduced, tweak values
changed main prog
attempted improvements
some more changes