using interpolation in demos again
code cleanup
initial work on drawing rectangles in Demo