numerous updates.
various updates