Docs + cleanups
Minor changes