Added conf_trim. Other minor modifications