Added drawCircle and drawSquare algors

Other minor comments and tweaks as well