misc comments, cleanups