small doc and make cleanups