Fixes for documentation

Based on github comments by ghoneycutt