Minor changes, debugging mode.