Small changes, debugging code