Add comments and debugger display