cleaned up the code.  Continuing adding features. Added circles.