Some other work.
Version increased, many cleanups.