typos
handle measure better