Fixed some of the egregious errors, more to fix