Fixes and improved debugger
merge