Minor cleanups, some more comments