Removing some comments.  Fixing a Collection / List bug.  Updating some
drawing components