Various changed from Jonathan

Ahh. Got lazy and tired here.. So.. Hmm...