address comments
more