Some debugging help added.
Bugfixes in 61an.