Updated comments mostly, part of cleanup effort.