Some small comments and debugger fixes