Feature/debug tools

Added debugging tools.