added stroke square, changed variable names