Bug fixes and refinements.
Working on a new entry. Also making some more refinements.