Signal numbers as macros.
Better Haddock comments.
More comments and cleanups.