Added support for notes that go over multiple actors.
Some minor cleanup.