Added a lot on orchestration and massive bugfixes.