some small cleanup and links

Change-Id: I63747e1d90e527731780bcb426aeacf0f70b6eff