Fixed some other style issues
Added specialized Paints
Better use of canvas.save/restore
More functions
Changed functions to use passed canvas instead of returning Picture objects