make options and makeoptions same, add patch from Ray