minor changes for easier debug