tweak tweak

Change-Id: Idf723090c189582ca4ef2187788dac72c71d3971
lots of udpates, not done

Change-Id: I47d2ceef1d5b2225174b0ba067ff735be17b65a9