Added lots of things

JK & EG