Fixes. Added methods for debugging