Unidown

Hey, I went through parts of your PR and corrected minor items.

I also had to merge upstream master!