Slight performance improvement for drawing circles and elipses
Add drawing code for the rest of the currently supported form types