refactored a bunch of code to use Graphics for vector drawing instead of it being directly on Shape
fixed some whitespace
fixed winding