fixes bug
fixes one bug and adds some support for debugging.
fixes one bug and adds some support for debugging.
merged from local working copy