changed everything
fixed up a bunch