some changes
Changes after Februar 1st workshop that also contains the solution for the homework.