refactored massively, based on events-sinks. no html code
3.0.0