add debug statements, additional ut