more comments, cleanups