Minor updates as to how I have it currently

Change-Id: I2ebd058a5ae83861a7419961777be335e9827f63