some fixes, enabled debug dumps