Grabbed updates from upstream and tweaked whites.