Various tweaks to improve performance and such.
Added wip visitor.

This is more a proof-of-concept really.