code cleanup.

Added a new simulator consumer and general code cleanup. wip...