Added more types. Fixed hook.  Improved controllers.

Change-Id: I998aece34f920fa7bc42b67eeb4ab1e58f1ce079