Put behaviour on event itself
Remove useless if statement
Fix some values not being closed over properly
Fix some specs
Don't choke on invalid dependencies