touch ups and cross linking

BUG=
R=sethladd@google.com

Review URL: https://chromiumcodereview.appspot.com/115063007