diff --git a/Makefile b/Makefile
index afa733528..efe0055cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # hledger project makefile
 
 # optional features described in MANUAL, comment out if you don't have the libs
-OPTFLAGS=-DHAPPS -DVTY 
+OPTFLAGS=-DHAPPS -DVTY
 
 # command to run during "make ci"
 CICMD=test
@@ -85,7 +85,8 @@ hledgerlinux: setversion
 continuous ci: setversion
 	sp --no-exts --no-default-map -o hledger ghc --make hledger.hs $(BUILDFLAGS) --run $(CICMD)
 
-# build the standalone unit test runner. Requires test-framework.
+# build the standalone unit test runner. Requires test-framework, which
+# may not work on windows.
 tools/unittest: tools/unittest.hs
 	ghc --make -threaded -O2 tools/unittest.hs
 
@@ -230,9 +231,11 @@ sample.ledger:
 ######################################################################
 # DOCUMENTATION
 
-# website/ and website/api-doc/ always exist. website contains both
-# generated files (UPPERCASE.html) and revision-controlled resource files
-# (everything else).  website/api-doc contains only generated files.
+# Documentation source files are UPPERCASE files in the top directory.
+# website/ contains both html generated from these (UPPERCASE.html) and
+# revision-controlled resource files (everything else).  website/api-doc
+# contains only generated files.
+
 cleandocs:
 	rm -rf website/[A-Z]*.html website/api-doc/*
 
diff --git a/Options.hs b/Options.hs
index a54e8e258..9bfe376ca 100644
--- a/Options.hs
+++ b/Options.hs
@@ -28,16 +28,16 @@ usagehdr =
   "COMMAND is one of (may be abbreviated):\n" ++
   "  add       - prompt for new transactions and add them to the ledger\n" ++
   "  balance   - show accounts, with balances\n" ++
-  "  convert   - convert CSV data to ledger format and print on stdout\n" ++
-  "  histogram - show transaction counts per day or other interval\n" ++
+  "  convert   - read CSV bank data and display in ledger format\n" ++
+  "  histogram - show a barchart of transactions per day or other interval\n" ++
   "  print     - show transactions in ledger format\n" ++
   "  register  - show transactions as a register with running balance\n" ++
   "  stats     - show various statistics for a ledger\n" ++
 #ifdef VTY
-  "  ui        - run a simple curses-based text ui\n" ++
+  "  ui        - run a simple text-based UI\n" ++
 #endif
 #ifdef HAPPS
-  "  web       - run a simple web ui\n" ++
+  "  web       - run a simple web-based UI\n" ++
 #endif
   "  test      - run self-tests\n" ++
   "\n" ++