Some more commentary, some more testing. Some little fixes.