Debugging
minor changes