block updates
tests
bug fixes
some more little fixes
Merge pull request #566 from k88hudson/events2

Some updates to reduce repeat event listeners