minor changes, cleaned setup, min val for mark out of set to 1