Refactoring + fixes of visual events.
More data updates.