address comments
debug