Bunch of changes

I was offline and had to lump a lot of commits together