Lots of improvements
* trainee client is now configured and set up correctly
Lots of improvements