Touchups: tests.
Touchups: code org.
Refactored: event and model centric.
Typos. Removed: obsolete tests.