Small Bug Fixes.Debugger Merged into master. Ready for pull request