Workshop fixes

@IgorMinar this is a pull request with various workshop fixes we've discussed. I hope that I've captured all the things you've noticed. I can merge it as soon as I've got a green light from you.