Fixed all the barf that was added