Merged updates, reverted barf usage. 

Don't like using barf the way it is, but I suppose it's best.