STE moved to own repo. A few bugfixes