Grab changes from Danny Joris.

Had some changes from review... Just rollin' 'em in.