clean
introduced polygon
full support of polygon + better label + clean (refactor comments)