Bug fixes; expanded scoring support

Fixed numerous bugs and expanded scoring for certain types of geometry
drawing items.