Changed indentations and setup for new debug capabilities.