New imputation options and several implementation fix