Minor updates + Docs