Updated comments, mostly complete.