misc cleanups & doc