Debug

Add more debugging capabilities