various updates and chagnes