merge to match small fixes

Small fixes were accidentally added to documentation. Merging to master to prevent confusion.