Updated circle and rect. Fixed functions and names. Fixed whitespace.