Took out functions from CirclemapDraw.

Might as well take it out?
Changed 'null' to 'p' to have it actually draw.