misc comments/cleanups