pro-epilog and option improvements