various changes
various updates