lots of improvements: logging/events ...