added stroke expansion and point index lookup