w -> width, h -> width, doc updates