Minor doc changes and code fixes