Added some stuff fron EBWG and shuffled stuff around.