Etau analysis

bugfixes