Fixed about 3/4 of the remaining bugs and TO DO's.

Some of the more major fixes are tool switching from an uneditable tool
to an editable shape tool and then undoing (error), retaining arrow
options, removing the empty shape type option, and fixing the shape type
toolbar synchronization.