Thrown in some more stuff found over the internet