Minor changes, debugging experiments