many changes thanks to alot of people

Change-Id: Ica4a1327e1fe7dc86728a269b2fe2dadcd702bcc