cleanups; documentation updates