Last changes and workarounds for demonstration
on monday

I had to put in some ugly hacks in order to
make it work. This must be changed in the final
version.