various updates
various changes