Add more command line docs + other cleanups