removed ets-stat + some fixes