Updates for Brent for more flexibility

I Just fixed a couple of merge conflicts that popped up. 

Closes #1719