Misc small changes, mostly branding for personal use

Change-Id: I38a7e42b495b6fe347dc7263bd578d02c5a23c89