Big speed up!!

replaced ghetto versions of things with the correct implementations
(rectangles/bars were stacks of lines, so was the large black block at the top right)