minor changes to improve debugging