minor fixes, option evaluations were misplaced.