Refactor / bugfix event and goal drawing. (fixes #181)