i made this easier to diff with cm 8960 -added back a ton of comments .