Tons of updates

Change-Id: Ic594ace332b586238c5ece44f820c0ded45ee373
Still updating

Change-Id: I20bfc6bd4f2f2b60fbc2ac3cc9a472d0c87b5f5c