More clean up.
Added source TLV option to be used in INIT hand shake.