sample2 simplified, solution to E2.2.1 added, various other bugfixes

There are still warnings about signal/non-signal connections