Improved a bunch of things.

The constructor now takes an optional dictionary.
Use isinstance() where appropriate.