re-enable options, reorganise parsing