Minor cleanup and fixes to documentation