All but 2 comments addressed