minor changes, debugging