misc comments, clean up