lots of changes, yay

Change-Id: I2c79ea6c906ba451879f10801be2b12f3e14a23b