Reworked options and merge code for feature finish