some comments and minor cleanups