Nomination added, small bugs left.  Also cleaned up some other small bugs.