Etau analysis

Bugfixes